Merge pull request 'btn' (#20) from btn into develop

src/admin/archives_do.php

@@ -343,19 +343,19 @@ else if ($dopost == 'moveArchives') {
         echo "<input type='hidden' name='qstr' value='{$qstr}'>";
         echo "<table width='100%' style='display:inline-block;z-index:9000'>";
         ?>
-        <tr height='26'>
-            <td width="86" class='bline'>&nbsp;目标栏目：</td>
-            <td class='bline'><?php echo $typeOptions; ?></td>
+        <tr>
+            <td width="86" height="26" class="bline">&nbsp;目标栏目：</td>
+            <td class="bline"><?php echo $typeOptions; ?></td>
         </tr>
-        <tr height='26'>
-            <td width="86" class='bline'>&nbsp;文档ID：</td>
-            <td class='bline'>
+        <tr>
+            <td width="86" height="26" class="bline">&nbsp;文档ID：</td>
+            <td class="bline">
                 <input type='text' name='tmpids' value="<?php echo $qstr; ?>" style='width:320px;overflow:hidden'>
                 <br>移动到的目标栏目必须和选定的文档频道类型一致，否则程序会自动勿略不符合的文档
             </td>
         </tr>
-        <tr height='36'>
-            <td colspan='2' align='center' class='py-3'>
+        <tr>
+            <td colspan="2" align="center" class="py-3">
                 <button type='submit' class='btn btn-success'>保存</button>
                 <button type='button' onclick='HideObj("<?php echo $divname; ?>");ChangeFullDiv("hide");' class='btn btn-success'>关闭</button>
             </td>
@@ -548,9 +548,9 @@ else if ($dopost == 'quickEdit') {
     echo "<input type='hidden' name='oldtypeid' value='{$arcRow['typeid']}'>";
     echo "<table width='100%' style='display:inline-block;z-index:9000'>";
     ?>
-    <tr height='26'>
-        <td width="86" class='bline'>&nbsp;所属栏目：</td>
-        <td class='bline'>
+    <tr>
+        <td width="86" height="26" class="bline">&nbsp;所属栏目：</td>
+        <td class="bline">
             <?php
             $typeOptions = GetOptionList($arcRow['typeid'], $cuserLogin->getUserChannel(), $arcRow['channel']);
             echo "<select name='typeid' style='width:320px'>";
@@ -560,9 +560,9 @@ else if ($dopost == 'quickEdit') {
             ?>
         </td>
     </tr>
-    <tr height='26'>
-        <td width="86" class='bline'>&nbsp;属性：</td>
-        <td class='bline'>
+    <tr>
+        <td width="86" height="26" class="bline">&nbsp;属性：</td>
+        <td class="bline">
             <input type='hidden' name='oldflag' value='<?php echo $arcRow['flag']; ?>'>
             <?php
             $dsql->SetQuery("SELECT * FROM `#@__arcatt` ORDER BY sortid ASC");
@@ -577,17 +577,17 @@ else if ($dopost == 'quickEdit') {
             ?>
         </td>
     </tr>
-    <tr height='26'>
-        <td width="86" class='bline'>&nbsp;标题：</td>
-        <td class='bline'><input name="title" type="text" id="title" value="<?php echo $arcRow['title']; ?>" style="width:320px"></td>
+    <tr>
+        <td width="86" height="26" class="bline">&nbsp;标题：</td>
+        <td class="bline"><input name="title" type="text" id="title" value="<?php echo $arcRow['title']; ?>" style="width:320px"></td>
     </tr>
-    <tr height='26'>
-        <td width="86" class='bline'>&nbsp;简略标题：</td>
-        <td class='bline'><input name="shorttitle" type="text" id="shorttitle" value="<?php echo $arcRow['shorttitle']; ?>" style="width:320px"></td>
+    <tr>
+        <td width="86" height="26" class="bline">&nbsp;简略标题：</td>
+        <td class="bline"><input name="shorttitle" type="text" id="shorttitle" value="<?php echo $arcRow['shorttitle']; ?>" style="width:320px"></td>
     </tr>
-    <tr height='26'>
-        <td width="86" class='bline'>&nbsp;阅读权限：</td>
-        <td class='bline'>
+    <tr>
+        <td width="86" height="26" class="bline">&nbsp;阅读权限：</td>
+        <td class="bline">
             <select name="arcrank" id="arcrank" style="width:100px">
                 <option value='<?php echo $arcRow["arcrank"] ?>'>
                 <?php echo $arcRow["rankname"] ?> </option>
@@ -603,12 +603,12 @@ else if ($dopost == 'quickEdit') {
             需要金币：<input name="money" type="text" id="money" value="<?php echo $arcRow["money"]; ?>" style="width:100px">
         </td>
     </tr>
-    <tr height='26'>
-        <td width="86" class='bline'>&nbsp;关键词：</td>
-        <td class='bline'><input name="keywords" type="text" id="keywords" value="<?php echo $arcRow['keywords']; ?>" style="width:320px"></td>
+    <tr>
+        <td width="86" height="26" class="bline">&nbsp;关键词：</td>
+        <td class="bline"><input name="keywords" type="text" id="keywords" value="<?php echo $arcRow['keywords']; ?>" style="width:320px"></td>
     </tr>
-    <tr height='36'>
-        <td colspan='2' align='center' class='py-3'>
+    <tr>
+        <td colspan="2" align="center" class="py-3">
             <button type='submit' class='btn btn-success'>保存</button>
             <button type='button' onclick='HideObj("<?php echo $divname; ?>");ChangeFullDiv("hide");' class='btn btn-success'>关闭</button>
         </td>
@@ -865,9 +865,9 @@ else if ($dopost == 'attsDlg') {
     echo "<input type='hidden' name='qstr' value='{$qstr}'>";
     echo "<table width='100%' style='display:inline-block;z-index:9000'>";
 ?>
-    <tr height='26'>
-        <td width="86" class='bline'>&nbsp;属性：</td>
-        <td class='bline'>
+    <tr>
+        <td width="86" height="26" class="bline">&nbsp;属性：</td>
+        <td class="bline">
             <input type='hidden' name='oldflag' value='<?php echo $arcRow['flag']; ?>'>
             <?php
             $dsql->SetQuery("SELECT * FROM `#@__arcatt` ORDER BY sortid ASC");
@@ -879,12 +879,12 @@ else if ($dopost == 'attsDlg') {
             ?>
         </td>
     </tr>
-    <tr height='26'>
-        <td width="86" class='bline'>&nbsp;文档ID：</td>
-        <td class='bline'><input type='text' name='tmpids' value="<?php echo $qstr; ?>" style='width:320px;overflow:hidden'></td>
+    <tr>
+        <td width="86" height="26" class="bline">&nbsp;文档ID：</td>
+        <td class="bline"><input type='text' name='tmpids' value="<?php echo $qstr; ?>" style='width:320px;overflow:hidden'></td>
     </tr>
-    <tr height='36'>
-        <td colspan='2' align='center' class='py-3'>
+    <tr>
+        <td colspan="2" align="center" class="py-3">
             <button type='submit' class='btn btn-success'>保存</button>
             <button type='button' onclick='HideObj("<?php echo $divname; ?>");ChangeFullDiv("hide");' class='btn btn-success'>关闭</button>
         </td>

src/admin/catalog_edit.php

@@ -165,15 +165,15 @@ if ($dopost == 'time') {
         <input type="hidden" name="moresite" value="<?php echo $myrow['moresite']; ?>">
         <table width="100%" border="0" cellpadding="0" cellspacing="0">
             <tr>
-                <td width="150" class='bline' height="26" align="center">是否支持投稿：</td>
-                <td class='bline'>
+                <td width="160" class="bline" height="26" align="center">是否支持投稿：</td>
+                <td class="bline">
                     <label><input type='radio' name='issend' value='0' class='np' <?php if ($myrow['issend'] == "0") echo " checked='1' "; ?>>&nbsp;不支持</label>
                     <label><input type='radio' name='issend' value='1' class='np' <?php if ($myrow['issend'] == "1") echo " checked='1' "; ?>>&nbsp;支持</label>
                 </td>
             </tr>
             <tr>
-                <td class='bline' height="26" align="center">内容模型：</td>
-                <td class='bline'>
+                <td class="bline" height="26" align="center">内容模型：</td>
+                <td class="bline">
                     <?php
                     foreach ($channelArray as $k => $arr) {
                         if ($k == $channelid) echo "{$arr['typename']} | {$arr['nid']}";
@@ -183,16 +183,16 @@ if ($dopost == 'time') {
                 </td>
             </tr>
             <tr>
-                <td class='bline' height="26" align="center">栏目名称：</td>
-                <td class='bline'><input name="typename" type="text" id="typename" value="<?php echo $myrow['typename'] ?>" style="width:260px" class="iptxt"></td>
+                <td class="bline" height="26" align="center">栏目名称：</td>
+                <td class="bline"><input name="typename" type="text" id="typename" value="<?php echo $myrow['typename'] ?>" style="width:260px" class="iptxt"></td>
             </tr>
             <tr>
-                <td class='bline' height="26" align="center"> 排列顺序：</td>
-                <td class='bline'> <input name="sortrank" type="text" value="<?php echo $myrow['sortrank'] ?>" style="width:100px" class="iptxt">（由低 &gt; 高）</td>
+                <td class="bline" height="26" align="center"> 排列顺序：</td>
+                <td class="bline"> <input name="sortrank" type="text" value="<?php echo $myrow['sortrank'] ?>" style="width:100px" class="iptxt">（由低 &gt; 高）</td>
             </tr>
             <tr>
-                <td class='bline' height="26" align="center">浏览权限：</td>
-                <td class='bline'>
+                <td class="bline" height="26" align="center">浏览权限：</td>
+                <td class="bline">
                     <select name="corank" id="corank" style="width:100px">
                     <?php
                     $dsql->SetQuery("SELECT * FROM `#@__arcrank` WHERE `rank` >= 0");
@@ -208,31 +208,31 @@ if ($dopost == 'time') {
                 </td>
             </tr>
             <tr>
-                <td class='bline' height="26" align="center">文件保存目录：</td>
-                <td class='bline'><input name="typedir" type="text" id="typedir" value="<?php echo $myrow['typedir'] ?>" style="width:260px"class="iptxt"></td>
+                <td class="bline" height="26" align="center">文件保存目录：</td>
+                <td class="bline"><input name="typedir" type="text" id="typedir" value="<?php echo $myrow['typedir'] ?>" style="width:260px"class="iptxt"></td>
             </tr>
             <tr>
-                <td height="26" align="center" class='bline'>栏目列表选项：</td>
-                <td class='bline'>
+                <td height="26" align="center" class="bline">栏目列表选项：</td>
+                <td class="bline">
                     <label><input type='radio' name='isdefault' value='1' class='np' <?php if ($myrow['isdefault'] == 1) echo " checked='1' "; ?>>&nbsp;链接到默认页</label>
                     <label><input type='radio' name='isdefault' value='0' class='np' <?php if ($myrow['isdefault'] == 0) echo " checked='1' "; ?>>&nbsp;链接到列表第一页</label>
                     <label><input type='radio' name='isdefault' value='-1' class='np' <?php if ($myrow['isdefault'] == -1) echo " checked='1' "; ?>>&nbsp;使用动态页</label>
                 </td>
             </tr>
             <tr>
-                <td class='bline' height="26" align="center">默认页的名称：</td>
-                <td class='bline'><input name="defaultname" type="text" value="<?php echo $myrow['defaultname'] ?>" style="width:260px" class="iptxt"></td>
+                <td class="bline" height="26" align="center">默认页的名称：</td>
+                <td class="bline"><input name="defaultname" type="text" value="<?php echo $myrow['defaultname'] ?>" style="width:260px" class="iptxt"></td>
             </tr>
             <tr>
-                <td height="26" class='bline' align="center">栏目属性：</td>
-                <td class='bline'>
+                <td height="26" class="bline" align="center">栏目属性：</td>
+                <td class="bline">
                     <label><input name="ispart" type="radio" id="radio" value="0" class='np' <?php if ($myrow['ispart'] == 0) echo " checked='1' "; ?>>&nbsp;最终列表栏目（允许在本栏目发布文档，并生成文档列表）</label><br>
                     <label><input name="ispart" type="radio" id="radio2" value="1" class='np' <?php if ($myrow['ispart'] == 1) echo " checked='1' "; ?>>&nbsp;频道封面（栏目本身不允许发布文档）</label><br>
                     <label><input name="ispart" type="radio" id="radio3" value="2" class='np' <?php if ($myrow['ispart'] == 2) echo " checked='1' "; ?>>&nbsp;外部连接（在"文件保存目录"处填写网址）</label>
                 </td>
             </tr>
             <tr>
-                <td align="center" colspan="2" height="50" bgcolor='#FAFEE0'>
+                <td bgcolor="#FAFEE0" colspan="2" align="center" class="py-3">
                     <button onclick='getSelCat("<?php echo $targetid; ?>");' class='btn btn-success'>保存</button>
                     <button type='button' onclick='CloseMsg()' class='btn btn-success'>关闭</button>
                 </td>

src/admin/dialog/select_images.php

@@ -141,7 +141,7 @@ a{text-decoration:none!important}
                     <label><input type="checkbox" name="resize" value="1" class="np"> 缩小 </label>
                     宽：<input type="text" name="iwidth" value="<?php echo $cfg_ddimg_width ?>" style="width:46px">
                     高：<input type="text" name="iheight" value="<?php echo $cfg_ddimg_height ?>" style="width:46px">
-                    <button type="submit" name="sb1" class="btn btn-success btn-sm">确定</button>
+                    <button type="submit" name="sb1" class="btn btn-success btn-sm">保存</button>
                 </form>
             </td>
         </tr>

src/admin/dialog/select_media.php

@@ -80,7 +80,7 @@ a{text-decoration:none!important}
                     <input type="hidden" name="job" value="upload">
                     <input type="hidden" name="CKEditorFuncNum" value="<?php echo isset($CKEditorFuncNum) ? $CKEditorFuncNum : 1; ?>">
                     上传：<input type="file" name="uploadfile" style="width:50%;border:none">
-                    <button type="submit" name="sb1" class="btn btn-success btn-sm">确定</button>
+                    <button type="submit" name="sb1" class="btn btn-success btn-sm">保存</button>
                 </form>
             </td>
         </tr>

src/admin/dialog/select_soft.php

@@ -85,7 +85,7 @@ a{text-decoration:none!important}
                     <input type="hidden" name="job" value="upload">
                     上传：<input type="file" name="uploadfile" size="24" style="width:50%;border:none">
                     改名：<input type="text" name="newname" style="width:160px">
-                    <button type="submit" name="sb1" class="btn btn-success btn-sm">确定</button>
+                    <button type="submit" name="sb1" class="btn btn-success btn-sm">保存</button>
                 </form>
             </td>
         </tr>

src/admin/dialog/select_templets.php

@@ -66,7 +66,7 @@ a{text-decoration:none!important}
                     <input type="hidden" name="job" value="upload">
                     上传：<input type="file" name="uploadfile" style="width:50%;border:none">
                     改名：<input type="text" name="filename" style="width:160px">
-                    <button type="submit" name="sb1" class="btn btn-success btn-sm">确定</button>
+                    <button type="submit" name="sb1" class="btn btn-success btn-sm">保存</button>
                 </form>
             </td>
         </tr>

src/admin/inc/inc_action_info.php

@@ -12,7 +12,7 @@ require_once(dirname(__FILE__)."/../config.php");
 $cuserLogin = new userLogin();
 //后台功能操作配置项
 $actionSearch[0] = array(
-    'toptitle' => '核心',
+    'toptitle' => '运维',
     'title'  => '常规操作',
     'description' => '站点档案常规功能操作',
     'soniterm' =>  array(
@@ -42,14 +42,14 @@ $actionSearch[0] = array(
         ),
         4  =>  array(
             'title' => '内容回收站',
-            'description' => '如果在"系统配置变量"的"核心设置"中开启了"文章回收站(是/否)开启功能",后台删除的文档将会存放在此处',
+            'description' => '如果在"系统配置变量"的"核心设置"中开启了"文章回收站是否开启功能"，后台删除的文档将会存放在此处',
             'purview' => 'a_List,a_AccList,a_MyList',
             'linkurl' => 'recycling.php'
         )
     )
 );
 $actionSearch[1] = array(
-    'toptitle' => '核心',
+    'toptitle' => '运维',
     'title' => '内容管理',
     'description' => '网站对应内容模型的文档管理',
     'soniterm' => array(
@@ -62,13 +62,13 @@ $actionSearch[1] = array(
     )
 );
 $actionSearch[2] = array(
-    'toptitle' => '核心',
+    'toptitle' => '运维',
     'title' => '附件管理',
     'description' => '所有上传的附件管理',
     'soniterm' => array(
         0  =>  array(
             'title' => '上传新文件 ',
-            'description' => '通过这可以上传图片、FLASH、视频/音频、附件/其它等附件 ',
+            'description' => '通过这可以上传图片、FLASH、视频音频、附件其它等附件 ',
             'purview' => '',
             'linkurl' => 'media_add.php'
         ),
@@ -87,7 +87,7 @@ $actionSearch[2] = array(
     )
 );
 $actionSearch[3] = array(
-    'toptitle' => '核心',
+    'toptitle' => '运维',
     'title' => '频道模型',
     'description' => '所有上传的附件管理',
     'soniterm' => array(
@@ -124,7 +124,7 @@ $actionSearch[3] = array(
     )
 );
 $actionSearch[4] = array(
-    'toptitle' => '核心',
+    'toptitle' => '运维',
     'title' => '批量维护',
     'description' => '对一些东西进行批量的删除，添加等等',
     'soniterm' => array(
@@ -266,67 +266,60 @@ $actionSearch[6] = array(
 );
 $actionSearch[7] = array(
     'toptitle' => '生成',
-    'title' => '自动任务',
+    'title' => '更新任务',
     'description' => '一键生成静态管理',
     'soniterm' => array(
         0  =>  array(
-            'title' => '一键更新网站',
+            'title' => '更新网站',
             'description' => '可以一键生成所有静态页面',
             'purview' => 'sys_MakeHtml',
             'linkurl' => 'makehtml_all.php'
         ),
         1  =>  array(
-            'title' => '更新系统缓存',
-            'description' => '更新栏目缓存、更新枚举缓存、清理arclist调用缓存、清理过期会员访问历史、删除过期短信 ',
-            'purview' => 'sys_ArcBatch',
-            'linkurl' => 'sys_cache_up.php'
-        ),
-    )
-);
-$actionSearch[8] = array(
-    'toptitle' => '生成',
-    'title' => 'HTML更新',
-    'description' => '针对主页、栏目、文档、专题等等进行更新',
-    'soniterm' => array(
-        0  =>  array(
             'title' => '更新主页',
             'description' => '生成网站主页面',
             'purview' => 'sys_MakeHtml',
             'linkurl' => 'makehtml_homepage.php'
         ),
-        1  =>  array(
-            'title' => '更新栏目 HTML',
+        2  =>  array(
+            'title' => '更新栏目',
             'description' => '对每个栏目进行静态页面的生成',
             'purview' => 'sys_MakeHtml',
             'linkurl' => 'makehtml_list.php'
         ),
-        2  =>  array(
-            'title' => '更新文档H',
+        3  =>  array(
+            'title' => '更新文档',
             'description' => '对每个栏目下的文档进行静态页面的生成',
             'purview' => 'sys_MakeHtml',
             'linkurl' => 'makehtml_archives.php'
         ),
-        3  =>  array(
+        4  =>  array(
+            'title' => '更新专题',
+            'description' => '对专题进行静态页面的生成',
+            'purview' => 'sys_MakeHtml',
+            'linkurl' => 'makehtml_spec.php'
+        ),
+        5  =>  array(
             'title' => '更新订阅',
             'description' => '对全站的RSS进行更新',
             'purview' => 'sys_MakeHtml',
             'linkurl' => 'makehtml_rss.php'
         ),
-        4  =>  array(
+        6  =>  array(
             'title' => '更新脚本',
             'description' => '可以获取某个栏目的脚本连接',
             'purview' => 'sys_MakeHtml',
             'linkurl' => 'makehtml_js.php'
         ),
-        5  =>  array(
-            'title' => '更新专题',
-            'description' => '对专题进行静态页面的生成',
-            'purview' => 'sys_MakeHtml',
-            'linkurl' => 'makehtml_spec.php'
+        7  =>  array(
+            'title' => '更新缓存',
+            'description' => '更新栏目缓存、更新枚举缓存、清理arclist调用缓存、清理过期会员访问历史、删除过期短信 ',
+            'purview' => 'sys_ArcBatch',
+            'linkurl' => 'sys_cache_up.php'
         ),
     )
 );
-$actionSearch[9] = array(
+$actionSearch[8] = array(
     'toptitle' => '模板',
     'title' => '模板管理',
     'description' => '针对主页、栏目、文档、专题等等进行更新',
@@ -363,7 +356,7 @@ $actionSearch[9] = array(
         ),
     )
 );
-$actionSearch[10] = array(
+$actionSearch[9] = array(
     'toptitle' => '系统',
     'title' => '系统设置',
     'description' => '对网站的一些基本信息和配置进行管理',
@@ -423,7 +416,7 @@ $actionSearch[10] = array(
             'linkurl' => 'article_template_rand.php'
         ),
         11  =>  array(
-            'title' => '数据库备份/还原',
+            'title' => '数据库备份还原',
             'description' => '对数据库进行备份和还原',
             'purview' => 'sys_data',
             'linkurl' => 'sys_data.php'
@@ -435,16 +428,16 @@ $actionSearch[10] = array(
             'linkurl' => 'sys_sql_query.php'
         ),
         14  =>  array(
-            'title' => '病毒扫描[S]',
+            'title' => '病毒扫描',
             'description' => '以DedeBIZ开发模式为标准对现有的文件进行扫描并进行判断',
             'purview' => 'sys_verifies',
             'linkurl' => 'sys_safetest.php'
         ),
         15  =>  array(
-            'title' => '系统错误修复[S]',
+            'title' => '系统错误修复',
             'description' => '由于手动升级时用户没运行指定的SQL语句，或自动升级的遗漏处理或处理出错，可能会导致一些错误，使用本工具会自动检测并处理',
             'purview' => 'sys_verifies',
             'linkurl' => 'sys_repair.php'
         ),
     )
-);
+);

src/admin/inc/inc_menu.php

@@ -27,28 +27,37 @@ if (empty($candoChannel)) $candoChannel = 1;
 $dsql->SetQuery("SELECT id,typename,addcon,mancon FROM `#@__channeltype` WHERE id IN({$candoChannel}) AND id<>-1 AND isshow=1 ORDER BY id ASC");
 $dsql->Execute('mm');
 while ($row = $dsql->GetObject('mm')) {
-    $addset .= "<m:item name='{$row->typename}' ischannel='1' link='{$row->mancon}?channelid={$row->id}' linkadd='{$row->addcon}?channelid={$row->id}' channelid='{$row->id}' rank='' target='main' />\r\n";
+    $addset .= "<m:item name='{$row->typename}' ischannel='1' link='{$row->mancon}?channelid={$row->id}' linkadd='{$row->addcon}?channelid={$row->id}' channelid='{$row->id}' rank='' target='main' />";
 }
 $helpUrl = DEDEBIZURL."/help";
 $gitUrl = DEDEBIZURL."/git";
 $dedebizUrl = DEDEBIZURL;
 $adminMenu1 = $adminMenu2 = '';
 if ($cuserLogin->getUserType() >= 10) {
-    $adminMenu1 = "<m:top item='1_' name='频道模型' display='block' rank='t_List,t_AccList,c_List,temp_One'>
+    $adminMenu1 = "<m:top item='7_' name='模板管理' display='block' rank='temp_One,temp_Other,temp_MyTag,temp_test,temp_All'>
+    <m:item name='默认模板管理' link='templets_main.php' rank='temp_All' target='main'/>
+    <m:item name='标签源码管理' link='templets_tagsource.php' rank='temp_All' target='main'/>
+    <m:item name='自定义宏标记' link='mytag_main.php' rank='temp_MyTag' target='main'/>
+    <m:item name='智能标记向导' link='mytag_tag_guide.php' rank='temp_Other' target='main'/>
+    <m:item name='全局标记测试' link='tag_test.php' rank='temp_Test' target='main'/>
+</m:top>
+<m:top item='1_7_' name='频道模型' display='block' rank='t_List,t_AccList,c_List,temp_One'>
     <m:item name='内容模型管理' link='mychannel_main.php' rank='c_List' target='main' />
     <m:item name='单页文档管理' link='templets_one.php' rank='temp_One' target='main'/>
     <m:item name='联动类别管理' link='stepselect_main.php' rank='c_Stepseclect' target='main' />
     <m:item name='自由列表管理' link='freelist_main.php' rank='c_List' target='main' />
     <m:item name='自定义表单' link='diy_main.php' rank='c_List' target='main' />
 </m:top>";
-  $adminMenu2 = "<m:top item='7_' name='模板管理' display='none' rank='temp_One,temp_Other,temp_MyTag,temp_test,temp_All'>
-    <m:item name='默认模板管理' link='templets_main.php' rank='temp_All' target='main'/>
-    <m:item name='标签源码管理' link='templets_tagsource.php' rank='temp_All' target='main'/>
-    <m:item name='自定义宏标记' link='mytag_main.php' rank='temp_MyTag' target='main'/>
-    <m:item name='智能标记向导' link='mytag_tag_guide.php' rank='temp_Other' target='main'/>
-    <m:item name='全局标记测试' link='tag_test.php' rank='temp_Test' target='main'/>
+  $adminMenu2 = "<m:top item='6_' name='支付工具' display='block' rank='sys_Data'>
+    <m:item name='点卡产品分类' link='cards_type.php' rank='sys_Data' target='main' />
+    <m:item name='点卡产品管理' link='cards_manage.php' rank='sys_Data' target='main' />
+    <m:item name='会员产品分类' link='member_type.php' rank='sys_Data' target='main' />
+    <m:item name='会员消费记录' link='member_operations.php' rank='sys_Data' target='main' />
+    <m:item name='商店订单记录' link='shops_operations.php' rank='sys_Data' target='main' />
+    <m:item name='支付接口设置' link='sys_payment.php' .php' rank='sys_Data' target='main' />
+    <m:item name='配货方式设置' link='shops_delivery.php' rank='sys_Data' target='main' />
 </m:top>
-<m:top item='10_' name='系统设置' display='none' rank='sys_User,sys_Group,sys_Edit,sys_Log,sys_Data'>
+<m:top item='10_' name='系统设置' display='block' rank='sys_User,sys_Group,sys_Edit,sys_Log,sys_Data'>
     <m:item name='系统配置变量' link='sys_info.php' rank='sys_Edit' target='main' />
     <m:item name='系统用户管理' link='sys_admin_user.php' rank='sys_User' target='main' />
     <m:item name='用户组设定' link='sys_group.php' rank='sys_Group' target='main' />
@@ -62,15 +71,6 @@ if ($cuserLogin->getUserType() >= 10) {
     <m:item name='SQL命令行工具' link='sys_sql_query.php' rank='sys_Data' target='main' />
     <m:item name='病毒文件扫描' link='sys_safetest.php' rank='sys_verify' target='main' />
     <m:item name='系统错误修复' link='sys_repair.php' rank='sys_verify' target='main' />
-</m:top>
-<m:top item='10_6_' name='支付工具' display='none' rank='sys_Data'>
-    <m:item name='点卡产品分类' link='cards_type.php' rank='sys_Data' target='main' />
-    <m:item name='点卡产品管理' link='cards_manage.php' rank='sys_Data' target='main' />
-    <m:item name='会员产品分类' link='member_type.php' rank='sys_Data' target='main' />
-    <m:item name='会员消费记录' link='member_operations.php' rank='sys_Data' target='main' />
-    <m:item name='商店订单记录' link='shops_operations.php' rank='sys_Data' target='main' />
-    <m:item name='支付接口设置' link='sys_payment.php' .php' rank='sys_Data' target='main' />
-    <m:item name='配货方式设置' link='shops_delivery.php' rank='sys_Data' target='main' />
 </m:top>";
 }
 $menusMain = "<m:top item='1_' name='常用操作' display='block'>
@@ -91,7 +91,7 @@ $menusMain = "<m:top item='1_' name='常用操作' display='block'>
     <m:item name='文件式管理器' link='media_main.php?dopost=filemanager' rank='plus_文件管理器' target='main' />
 </m:top>
 $adminMenu1
-<m:top item='1_3_3' name='批量维护' display='block'>
+<m:top item='1_' name='批量维护' display='block'>
     <m:item name='更新系统缓存' link='sys_cache_up.php' rank='sys_ArcBatch' target='main' />
     <m:item name='文档批量维护' link='content_batch_up.php' rank='sys_ArcBatch' target='main' />
     <m:item name='搜索关键词维护' link='search_keywords_main.php' rank='sys_Keyword' target='main' />
@@ -101,27 +101,25 @@ $adminMenu1
     <m:item name='Tag标签管理' link='tags_main.php' rank='sys_Keyword' target='main' />
     <m:item name='数据库内容替换' link='sys_data_replace.php' rank='sys_ArcBatch' target='main' />
 </m:top>
-<m:top item='5_' name='自动任务' notshowall='1'  display='block' rank='sys_MakeHtml'>
-    <m:item name='一键更新网站' link='makehtml_all.php' rank='sys_MakeHtml' target='main' />
-    <m:item name='更新系统缓存' link='sys_cache_up.php' rank='sys_ArcBatch' target='main' />
-</m:top>
-<m:top item='5_' name='更新网站' notshowall='1' display='none' rank='sys_MakeHtml'>
+<m:top item='5_' name='更新任务' display='block' notshowall='1' rank='sys_MakeHtml'>
+    <m:item name='更新整站' link='makehtml_all.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新首页' link='makehtml_homepage.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新栏目' link='makehtml_list.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新文档' link='makehtml_archives.php' rank='sys_MakeHtml' target='main' />
+    <m:item name='更新标签' link='makehtml_taglist.php' rank='sys_MakeHtml' target='main' />
+    <m:item name='更新专题' link='makehtml_spec.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新订阅' link='makehtml_rss.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新脚本' link='makehtml_js.php' rank='sys_MakeHtml' target='main' />
-    <m:item name='更新专题' link='makehtml_spec.php' rank='sys_MakeHtml' target='main' />
-    <m:item name='更新标签' link='makehtml_taglist.php' rank='sys_MakeHtml' target='main' />
+    <m:item name='更新缓存' link='sys_cache_up.php' rank='sys_ArcBatch' target='main' />
 </m:top>
-<m:top item='6_' name='会员管理' display='none' rank='member_List,member_Type'>
+<m:top item='6_' name='会员管理' display='block' rank='member_List,member_Type'>
     <m:item name='注册会员列表' link='member_main.php' rank='member_List' target='main' />
     <m:item name='会员级别设置' link='member_rank.php' rank='member_Type' target='main' />
     <m:item name='积分头衔设置' link='member_scores.php' rank='member_Type' target='main' />
     <m:item name='会员短信管理' link='member_pm.php' rank='member_Type' target='main' />
 </m:top>
 $adminMenu2
-<m:top item='1_10_7_' name='系统帮助' display='none'>
+<m:top item='1_5_10_' name='系统帮助' display='none'>
     <m:item name='系统概况' link='$cfg_biz_helpUrl' rank='' target='_blank' />
     <m:item name='代码托管' link='$cfg_biz_gitUrl' rank='' target='_blank' />
 </m:top>";

src/admin/inc/inc_menu_map.php

@@ -28,7 +28,7 @@ if (empty($candoChannel)) $candoChannel = 1;
 $dsql->SetQuery("SELECT id,typename,addcon,mancon FROM `#@__channeltype` WHERE id IN({$candoChannel}) AND id<>-1 AND isshow=1 ORDER BY id ASC");
 $dsql->Execute();
 while ($row = $dsql->GetObject()) {
-    $addset .= "<m:item name='{$row->typename}' ischannel='1' link='{$row->mancon}?channelid={$row->id}' linkadd='{$row->addcon}?channelid={$row->id}' channelid='{$row->id}' rank='' target='main' />\r\n";
+    $addset .= "<m:item name='{$row->typename}' ischannel='1' link='{$row->mancon}?channelid={$row->id}' linkadd='{$row->addcon}?channelid={$row->id}' channelid='{$row->id}' rank='' target='main' />";
 }
 $menusMain = "<m:top mapitem='1' item='1_' name='常用操作' display='block'>
     <m:item name='网站栏目管理' link='catalog_main.php' ischannel='1' addalt='创建栏目' linkadd='catalog_add.php?listtype=all' rank='t_List,t_AccList' target='main' />
@@ -42,14 +42,14 @@ $menusMain = "<m:top mapitem='1' item='1_' name='常用操作' display='block'>
     $addset
     <m:item name='专题管理' ischannel='1' link='content_s_list.php' linkadd='spec_add.php' channelid='-1' rank='spec_New' target='main' />
 </m:top>
-<m:top mapitem='1' item='1_' name='频道模型' display='block' rank='t_List,t_AccList,c_List,temp_One'>
+<m:top mapitem='2' item='1_7_' name='频道模型' display='block' rank='t_List,t_AccList,c_List,temp_One'>
     <m:item name='内容模型管理' link='mychannel_main.php' rank='c_List' target='main' />
     <m:item name='单页文档管理' link='templets_one.php' rank='temp_One' target='main'/>
     <m:item name='联动类别管理' link='stepselect_main.php' rank='c_Stepseclect' target='main' />
     <m:item name='自由列表管理' link='freelist_main.php' rank='c_List' target='main' />
     <m:item name='自定义表单' link='diy_main.php' rank='c_List' target='main' />
 </m:top>
-<m:top mapitem='3' item='1_3_3' name='批量维护' display='block'>
+<m:top mapitem='3' item='1_' name='批量维护' display='block'>
     <m:item name='更新系统缓存' link='sys_cache_up.php' rank='sys_ArcBatch' target='main' />
     <m:item name='文档批量维护' link='content_batch_up.php' rank='sys_ArcBatch' target='main' />
     <m:item name='搜索关键词维护' link='search_keywords_main.php' rank='sys_Keyword' target='main' />
@@ -58,46 +58,29 @@ $menusMain = "<m:top mapitem='1' item='1_' name='常用操作' display='block'>
     <m:item name='Tag标签管理' link='tags_main.php' rank='sys_Keyword' target='main' />
     <m:item name='数据库内容替换' link='sys_data_replace.php' rank='sys_ArcBatch' target='main' />
 </m:top>
-<m:top mapitem='4' item='5_' name='自动任务' notshowall='1'  display='block' rank='sys_MakeHtml'>
-    <m:item name='一键更新网站' link='makehtml_all.php' rank='sys_MakeHtml' target='main' />
-    <m:item name='更新系统缓存' link='sys_cache_up.php' rank='sys_ArcBatch' target='main' />
+<m:top mapitem='3' item='1_' name='附件管理' display='none' rank='sys_Upload,sys_MyUpload,plus_文件管理器'>
+    <m:item name='上传新文件' link='media_add.php' rank='' target='main' />
+    <m:item name='附件数据管理' link='media_main.php' rank='sys_Upload,sys_MyUpload' target='main' />
+    <m:item name='文件式管理器' link='media_main.php?dopost=filemanager' rank='plus_文件管理器' target='main' />
 </m:top>
-<m:top mapitem='4' item='5_' name='更新网站' notshowall='1' display='none' rank='sys_MakeHtml'>
+<m:top mapitem='1' item='5_' name='更新任务' display='block' notshowall='1' rank='sys_MakeHtml'>
+    <m:item name='更新整站' link='makehtml_all.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新首页' link='makehtml_homepage.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新栏目' link='makehtml_list.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新文档' link='makehtml_archives.php' rank='sys_MakeHtml' target='main' />
+    <m:item name='更新标签' link='makehtml_taglist.php' rank='sys_MakeHtml' target='main' />
+    <m:item name='更新专题' link='makehtml_spec.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新订阅' link='makehtml_rss.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新脚本' link='makehtml_js.php' rank='sys_MakeHtml' target='main' />
-    <m:item name='更新专题' link='makehtml_spec.php' rank='sys_MakeHtml' target='main' />
-    <m:item name='更新标签' link='makehtml_taglist.php' rank='sys_MakeHtml' target='main' />
-</m:top>
-<m:top mapitem='3' item='1_6_' name='附件管理' display='none' rank='sys_Upload,sys_MyUpload,plus_文件管理器'>
-    <m:item name='上传新文件' link='media_add.php' rank='' target='main' />
-    <m:item name='附件数据管理' link='media_main.php' rank='sys_Upload,sys_MyUpload' target='main' />
-    <m:item name='文件式管理器' link='media_main.php?dopost=filemanager' rank='plus_文件管理器' target='main' />
+    <m:item name='更新缓存' link='sys_cache_up.php' rank='sys_ArcBatch' target='main' />
 </m:top>
-<m:top mapitem='5' item='6_' name='会员管理' display='none' rank='member_List,member_Type'>
+<m:top mapitem='5' item='6_' name='会员管理' display='block' rank='member_List,member_Type'>
     <m:item name='注册会员列表' link='member_main.php' rank='member_List' target='main' />
     <m:item name='会员级别设置' link='member_rank.php' rank='member_Type' target='main' />
     <m:item name='积分头衔设置' link='member_scores.php' rank='member_Type' target='main' />
     <m:item name='会员短信管理' link='member_pm.php' rank='member_Type' target='main' />
 </m:top>
-<m:top mapitem='2' item='10_' name='系统设置' display='none' rank='sys_User,sys_Group,sys_Edit,sys_Log,sys_Data'>
-    <m:item name='系统配置变量' link='sys_info.php' rank='sys_Edit' target='main' />
-    <m:item name='系统用户管理' link='sys_admin_user.php' rank='sys_User' target='main' />
-    <m:item name='用户组设定' link='sys_group.php' rank='sys_Group' target='main' />
-    <m:item name='系统日志管理' link='log_list.php' rank='sys_Log' target='main' />
-    <m:item name='图片水印设置' link='sys_info_mark.php' rank='sys_Edit' target='main' />
-    <m:item name='自定义文档属性' link='content_att.php' rank='sys_Att' target='main' />
-    <m:item name='软件频道设置' link='soft_config.php' rank='sys_SoftConfig' target='main' />
-    <m:item name='防采集串混淆' link='article_string_mix.php' rank='sys_StringMix' target='main' />
-    <m:item name='随机模板设置' link='article_template_rand.php' rank='sys_StringMix' target='main' />
-    <m:item name='数据库备份还原' link='sys_data.php' rank='sys_Data' target='main' />
-    <m:item name='SQL命令行工具' link='sys_sql_query.php' rank='sys_Data' target='main' />
-    <m:item name='病毒文件扫描' link='sys_safetest.php' rank='sys_verify' target='main' />
-    <m:item name='系统错误修复' link='sys_repair.php' rank='sys_verify' target='main' />
-</m:top>
-<m:top mapitem='5' item='10_6_' name='支付工具' display='none' rank='sys_Data'>
+<m:top mapitem='5' item='6_' name='支付工具' display='block' rank='sys_Data'>
     <m:item name='点卡产品分类' link='cards_type.php' rank='sys_Data' target='main' />
     <m:item name='点卡产品管理' link='cards_manage.php' rank='sys_Data' target='main' />
     <m:item name='会员产品分类' link='member_type.php' rank='sys_Data' target='main' />
@@ -106,19 +89,34 @@ $menusMain = "<m:top mapitem='1' item='1_' name='常用操作' display='block'>
     <m:item name='支付接口设置' link='sys_payment.php' .php' rank='sys_Data' target='main' />
     <m:item name='配货方式设置' link='shops_delivery.php' rank='sys_Data' target='main' />
 </m:top>
-<m:top mapitem='2' item='10_7_' name='模板管理' display='none' rank='temp_One,temp_Other,temp_MyTag,temp_test,temp_All'>
+<m:top mapitem='1' item='7_' name='模板管理' display='block' rank='temp_One,temp_Other,temp_MyTag,temp_test,temp_All'>
     <m:item name='默认模板管理' link='templets_main.php' rank='temp_All' target='main'/>
     <m:item name='标签源码管理' link='templets_tagsource.php' rank='temp_All' target='main'/>
     <m:item name='自定义宏标记' link='mytag_main.php' rank='temp_MyTag' target='main'/>
     <m:item name='智能标记向导' link='mytag_tag_guide.php' rank='temp_Other' target='main'/>
     <m:item name='全局标记测试' link='tag_test.php' rank='temp_Test' target='main'/>
+</m:top>
+<m:top mapitem='2' item='10_' name='系统设置' display='block' rank='sys_User,sys_Group,sys_Edit,sys_Log,sys_Data'>
+    <m:item name='系统配置变量' link='sys_info.php' rank='sys_Edit' target='main' />
+    <m:item name='系统用户管理' link='sys_admin_user.php' rank='sys_User' target='main' />
+    <m:item name='用户组设定' link='sys_group.php' rank='sys_Group' target='main' />
+    <m:item name='系统日志管理' link='log_list.php' rank='sys_Log' target='main' />
+    <m:item name='图片水印设置' link='sys_info_mark.php' rank='sys_Edit' target='main' />
+    <m:item name='自定义文档属性' link='content_att.php' rank='sys_Att' target='main' />
+    <m:item name='软件频道设置' link='soft_config.php' rank='sys_SoftConfig' target='main' />
+    <m:item name='防采集串混淆' link='article_string_mix.php' rank='sys_StringMix' target='main' />
+    <m:item name='随机模板设置' link='article_template_rand.php' rank='sys_StringMix' target='main' />
+    <m:item name='数据库备份还原' link='sys_data.php' rank='sys_Data' target='main' />
+    <m:item name='SQL命令行工具' link='sys_sql_query.php' rank='sys_Data' target='main' />
+    <m:item name='病毒文件扫描' link='sys_safetest.php' rank='sys_verify' target='main' />
+    <m:item name='系统错误修复' link='sys_repair.php' rank='sys_verify' target='main' />
 </m:top>";
 //载入插件菜单
 $plusset = '';
 $dsql->SetQuery("SELECT * FROM `#@__plus` WHERE isshow=1 ORDER BY aid ASC");
 $dsql->Execute();
 while ($row = $dsql->GetObject()) {
-  $plusset .= $row->menustring."\r\n";
+  $plusset .= $row->menustring."";
 }
 $menusMain .= "
 <m:top mapitem='6' name='模块管理' c='6,' display='block'>
@@ -135,22 +133,22 @@ $dtp = new DedeTagparse();
 $dtp->SetNameSpace('m', '<', '>');
 $dtp->LoadString($menusMain);
 foreach ($maparray as $k => $bigname) {
-    $mapstring .= "<dl class='maptop'>\r\n";
-    $mapstring .= "<dt class='bigitem'>$bigname</dt>\r\n";
-    $mapstring .= "<dd>\r\n";
+    $mapstring .= "<dl class='maptop'>";
+    $mapstring .= "<dt class='bigitem'>$bigname</dt>";
+    $mapstring .= "<dd>";
     foreach ($dtp->CTags as $ctag) {
         if ($ctag->GetAtt('mapitem') == $k) {
-            $mapstring .= "<dl class='mapitem'>\r\n";
-            $mapstring .= "<dt>".$ctag->GetAtt('name')."</dt>\r\n";
-            $mapstring .= "<dd>\r\n<ul class='item'>\r\n";
+            $mapstring .= "<dl class='mapitem'>";
+            $mapstring .= "<dt>".$ctag->GetAtt('name')."</dt>";
+            $mapstring .= "<dd><ul class='item'>";
             $dtp2 = new DedeTagParse();
             $dtp2->SetNameSpace('m', '<', '>');
             $dtp2->LoadSource($ctag->InnerText);
             foreach ($dtp2->CTags as $j => $ctag2) {
-                $mapstring .= "<li><a href='".$ctag2->GetAtt('link')."' target='".$ctag2->GetAtt('target')."'>".$ctag2->GetAtt('name')."</a></li>\r\n";
+                $mapstring .= "<li><a href='".$ctag2->GetAtt('link')."' target='".$ctag2->GetAtt('target')."'>".$ctag2->GetAtt('name')."</a></li>";
             }
-            $mapstring .= "</ul>\r\n</dd>\r\n</dl>\r\n";
+            $mapstring .= "</ul></dd></dl>";
         }
     }
-    $mapstring .= "</dd>\r\n</dl>\r\n";
+    $mapstring .= "</dd></dl>";
 }

src/admin/index_menu_module.php

@@ -35,7 +35,7 @@ require(DEDEADMIN.'/inc/inc_menu_func.php');
 <body>
 	<table width='100%' height="100%" border='0' cellspacing='0' cellpadding='0'>
 		<tr>
-			<td style='padding-left:3px;padding-top:8px' valign="top">
+			<td>
 				<?php
 				GetMenus($cuserLogin->getUserRank(), 'module');
 				?>

src/admin/mychannel_edit.php

@@ -126,7 +126,7 @@ else if ($dopost == "exportin") {
     $win = new OxWindow();
     $win->Init("mychannel_edit.php", "js/blank.js", "post");
     $win->AddHidden("dopost", "exportinok");
-    $win->AddTitle("输入规则内容：(导入模型会和原有模型冲突，不过可以在导入后修改)");
+    $win->AddTitle("输入规则内容：导入模型会和原有模型冲突，不过可以在导入后修改");
     $win->AddMsgItem("<textarea name='exconfig' style='width:98%;height:450px;word-wrap: break-word;word-break:break-all;'></textarea>");
     $winform = $win->GetWindow("ok");
     $win->Display();

src/admin/sys_admin_user_tj.php

@@ -100,7 +100,7 @@ if (isset($dopost) && $dopost == 'getone') {
     $ddd = $row['dd'] + $ddd;
     $ccd = $row['cc'] + $ccd;
 
-    $msg = "<table width='96%' border='0' align='center' cellpadding='3' cellspacing='1'>
+    $msg = "<table width='100%' border='0' align='center' cellpadding='3' cellspacing='1'>
     <tr align='center' bgcolor='#FBFCE2'>
       <td width='18%' height='26'>管理员::统计信息</td>
       <td width='18%'>全部(文档|点击)</td>

src/admin/templets/ad_add.htm

@@ -69,18 +69,18 @@
       background: url(../static/web/img/adtype_act.gif) no-repeat scroll 0px 0px;
     }
     .i_table {
-      border: 1px solid #CCC;
+      border: 1px solid #eee;
     }
   </style>
 </head>
 <body>
   <form action="ad_add.php" method="post" name="form1" onSubmit="return checkSubmit()">
-    <table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" class="table maintable mt-3">
+    <table width="98%" border="0" cellpadding="3" cellspacing="1" align="center" class="table maintable mt-3">
       <tr>
-        <td height="26" background="../static/web/img/tbg.gif" style="padding-left:10px"><a href="ad_main.php">广告管理</a> &gt; 增加广告位置 </td>
+        <td height="26" background="../static/web/img/tbg.gif" style="padding-left:10px"><a href="ad_main.php">广告管理</a> &gt; 增加广告位置</td>
       </tr>
       <tr>
-        <td height="200" bgcolor="#ffffff" valign="top">
+        <td height="200" bgcolor="#ffffff">
           <table width="100%" border="0" cellspacing="4" cellpadding="4" class="table table-borderless">
             <input name="normbody[style]" type="hidden" value="code" id="adstyle">
             <input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token']; ?>">
@@ -89,52 +89,55 @@
               <td height="26" colspan="3">广告代码的调用方法：{dede:myad name='广告位标识'/} </td>
             </tr>
             <tr>
-              <td height="26" align="center">广告位标识：</td>
-              <td colspan="2"><input name="tagname" type="text" id="tagname" class='iptxt' />
-                （使用英文或数字表示的简洁标识）</td>
+              <td width="160" height="26">广告位标识：</td>
+              <td colspan="2"><input name="tagname" type="text" id="tagname" class="iptxt" style="width:260px">（使用英文或数字表示的简洁标识）</td>
             </tr>
             <tr>
-              <td height="26" align="center">广告分类：</td>
-              <td colspan="2"><select name='clsid' style='width:150px' id="clsid">
+              <td height="26">广告分类：</td>
+              <td colspan="2">
+                <select name='clsid' id="clsid" style='width:160px'>
                   <option value='0'>默认分类</option>
                   <?php echo $option; ?>
-                </select></td>
+                </select>
+              </td>
             </tr>
             <tr>
-              <td width="15%" height="26" align="center">广告投放范围：</td>
+              <td height="26">广告投放范围：</td>
               <td colspan="2"><?php
-			$tl = new TypeLink(0);
-			$typeOptions = $tl->GetOptionArray(0,0,0);
-			echo "<select name='typeid' style='width:260px'>\r\n";
-			echo "<option value='0' selected>投放在没有同名标识的所有栏目</option>\r\n";
-			echo $typeOptions;
-			echo "</select>";
-			?>
+      $tl = new TypeLink(0);
+      $typeOptions = $tl->GetOptionArray(0,0,0);
+      echo "<select name='typeid' style='width:160px'>\r\n";
+      echo "<option value='0' selected>投放在没有同名标识的所有栏目</option>\r\n";
+      echo $typeOptions;
+      echo "</select>";
+      ?>
                 <br>
-                （如果在所选栏目找不到指定标识的广告内容，系统会自动搜索父栏目）</td>
+              （如果在所选栏目找不到指定标识的广告内容，系统会自动搜索父栏目）</td>
             </tr>
             <tr>
-              <td height="26" align="center">广告位名称：</td>
-              <td colspan="2"><input name="adname" type="text" id="adname" size="30" class='iptxt' /></td>
+              <td height="26">广告位名称：</td>
+              <td colspan="2"><input name="adname" type="text" id="adname" class="iptxt" style="width:260px"></td>
             </tr>
             <tr>
-              <td height="26" align="center">时间限制：</td>
-              <td colspan="2"><input name="timeset" type="radio" class="np" value="0" checked='1' id="notimelimit">
+              <td height="26">时间限制：</td>
+              <td colspan="2">
+                <input name="timeset" type="radio" class="np" value="0" checked='1' id="notimelimit">
                 <label for="notimelimit">永不过期</label>
                 <input type="radio" name="timeset" class="np" value="1" id="timelimit">
-                <label for="timelimit">在设内时间内有效</label></td>
+                <label for="timelimit">在设内时间内有效</label>
+              </td>
             </tr>
             <tr>
-              <td height="26" align="center">投放时间：</td>
+              <td height="26">投放时间：</td>
               <td colspan="2">从
-                <input name="starttime" type="text" id="starttime" value="<?php echo $startDay?>" class='iptxt datepicker' />
+                <input name="starttime" type="text" id="starttime" value="<?php echo $startDay?>" class='iptxt datepicker' style="width:160px">
                 到
-                <input name="endtime" type="text" id="endtime" value="<?php echo $endDay?>" class='iptxt datepicker' />
+                <input name="endtime" type="text" id="endtime" value="<?php echo $endDay?>" class='iptxt datepicker' style="width:160px">
               </td>
             </tr>
             <tr>
-              <td height="80" align="center">广告内容：</td>
-              <td width="76%">
+              <td height="80">广告内容：</td>
+              <td width="70%">
                 <div class="typetab">
                   <ul id="changeTab">
                     <li id="t_code" class="act">代码</li>
@@ -144,100 +147,93 @@
                   </ul>
                   <div style="clear:both"></div>
                 </div>
-                <div id='advert'>
-
-                </div>
+                <div id='advert'></div>
               </td>
               <td width="9%"></td>
             </tr>
             <tr>
-              <td height="80" align="center">过期显示内容：</td>
+              <td height="80">过期显示内容：</td>
               <td><textarea name="expbody" rows="10" id="expbody" style="width:80%;height:100px"></textarea></td>
               <td></td>
             </tr>
             <tr>
-              <td height="53" align="center"></td>
-              <td colspan="2">
-                <button type="submit" class="btn btn-success">确定</button>
-                </td>
+              <td colspan="3" align="center" class="py-3"><button type="submit" class="btn btn-success">保存</button></td>
             </tr>
-
           </table>
         </td>
       </tr>
     </table>
   </form>
   <div style="display:none" id="formtxt">
-    <div class="content" id="code" style="display:none;">
+    <div class="content" id="code" style="display:none">
       <table width="80%" cellpadding="3" cellspacing="1" class="i_table">
         <tr class="b">
-          <td width="30%">广告代码:<br>
+          <td width="160">广告代码:<br>
             请填写广告代码，支持html代码</td>
-          <td><textarea name="normbody[htmlcode]" rows="5" cols="50"></textarea></td>
+          <td><textarea name="normbody[htmlcode]" style="width:380px;height:100px"></textarea></td>
         </tr>
       </table>
     </div>
-    <div class="content" id="txt" style="display:none;">
+    <div class="content" id="txt" style="display:none">
       <table width="80%" cellpadding=3 cellspacing=1 class='i_table'>
         <tr>
-          <td class="b" width="30%">文字内容*</td>
-          <td class="b"><input type="text" size="70" name="normbody[title]" value="" class='iptxt' /></td>
+          <td class="b" width="160">文字内容 *</td>
+          <td class="b"><input type="text" name="normbody[title]" value="" class="iptxt" style="width:360px"></td>
         </tr>
         <tr>
-          <td class="b">文字链接*</td>
-          <td class="b"><input type="text" size="70" name="normbody[link]" value="" class='iptxt' /></td>
+          <td class="b">文字链接 *</td>
+          <td class="b"><input type="text" name="normbody[link]" value="" class="iptxt" style="width:360px"></td>
         </tr>
         <tr>
-          <td class="b">文字颜色(例如:red,#EF8684)</td>
-          <td class="b"><input type="text" size="10" name="normbody[color]" value="" class='iptxt' /></td>
+          <td class="b">文字颜色</td>
+          <td class="b"><input type="text" name="normbody[color]" value="" class="iptxt" style="width:360px"></td>
         </tr>
         <tr>
-          <td class="b">文字大小(例如:4px,12px)</td>
-          <td class="b"><input type="text" size="10" name="normbody[size]" value="" class='iptxt' /></td>
+          <td class="b">文字大小</td>
+          <td class="b"><input type="text" name="normbody[size]" value="" class="iptxt" style="width:360px"></td>
         </tr>
       </table>
     </div>
-    <div class="content" id="img" style="display:none;">
+    <div class="content" id="img" style="display:none">
       <table width="80%" cellpadding=3 cellspacing=1 class='i_table'>
         <tr>
-          <td class="b" width="30%">图片地址*</td>
-          <td class="b"><input type="text" size="40" name="normbody[url]" value="" class='iptxt' /></td>
+          <td class="b" width="160">图片地址 *</td>
+          <td class="b"><input type="text" name="normbody[url]" value="" class="iptxt" style="width:360px"></td>
         </tr>
         <tr>
-          <td class="b">图片链接*</td>
-          <td class="b"><input type="text" size="40" name="normbody[link]" value="" class='iptxt' /></td>
+          <td class="b">图片链接 *</td>
+          <td class="b"><input type="text" name="normbody[link]" value="" class="iptxt" style="width:360px"></td>
         </tr>
         <tr>
           <td class="b">图片宽度</td>
-          <td class="b"><input type="text" size="10" name="normbody[width]" value="" class='iptxt' /></td>
+          <td class="b"><input type="text" name="normbody[width]" value="" class="iptxt" style="width:360px"></td>
         </tr>
         <tr>
           <td class="b">图片高度</td>
-          <td class="b"><input type="text" size="10" name="normbody[height]" value="" class='iptxt' /></td>
+          <td class="b"><input type="text" name="normbody[height]" value="" class="iptxt" style="width:360px"></td>
         </tr>
         <tr>
           <td class="b">图片描述</td>
-          <td class="b"><input type="text" size="40" name="normbody[descrip]" value="" class='iptxt' /></td>
+          <td class="b"><input type="text" name="normbody[descrip]" value="" class="iptxt" style="width:360px"></td>
         </tr>
       </table>
     </div>
-    <div class="content" id="flash" style="display:none;">
+    <div class="content" id="flash" style="display:none">
       <table width="80%" cellpadding=3 cellspacing=1 class='i_table'>
         <tr>
-          <td class="b" width="30%">flash链接</td>
-          <td class="b"><input type="text" size="40" name="normbody[link]" value="" class='iptxt' /></td>
+          <td class="b" width="160">flash链接</td>
+          <td class="b"><input type="text" name="normbody[link]" value="" class="iptxt" style="width:360px"></td>
         </tr>
         <tr>
           <td class="b">flash宽度</td>
-          <td class="b"><input type="text" size="40" name="normbody[width]" value="" class='iptxt' /></td>
+          <td class="b"><input type="text" name="normbody[width]" value="" class="iptxt" style="width:360px"></td>
         </tr>
         <tr>
           <td class="b">flash高度</td>
-          <td class="b"><input type="text" size="40" name="normbody[height]" value="" class='iptxt' /></td>
+          <td class="b"><input type="text" name="normbody[height]" value="" class="iptxt" style="width:360px"></td>
         </tr>
       </table>
     </div>
-
   </div>
   <script language="JavaScript">
       (function ($) {
@@ -245,9 +241,7 @@
           $("#advert").html("").html($("#formtxt>#" + idName).html());
           $("#adstyle").val(idName);
         }
-
         showcode('code');
-
         $("#changeTab>li").click(function () {
           var tabLi = $(this);
           var thistab = tabLi[0].id;

src/admin/templets/ad_edit.htm

@@ -44,30 +44,31 @@
   </script>
 </head>
 <body>
-  <table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" class="table maintable mt-3">
+  <table width="98%" border="0" cellpadding="3" cellspacing="1"  align="center" class="table maintable mt-3">
     <tr>
-      <td height="26" background="../static/web/img/tbg.gif" style="padding-left:10px">&nbsp;<a href="ad_main.php">广告管理</a> &gt; 修改广告 </td>
+      <td height="26" background="../static/web/img/tbg.gif" style="padding-left:10px"><a href="ad_main.php">广告管理</a> &gt; 修改广告</td>
     </tr>
     <tr>
-      <td height="200" bgcolor="#ffffff" valign="top">
+      <td height="200" bgcolor="#ffffff">
         <table width="100%" border="0" cellspacing="4" cellpadding="4" class="table table-borderless">
           <form action="ad_edit.php" method="post" enctype="multipart/form-data" name="form1">
             <input type='hidden' name='aid' value='<?php echo $aid?>'>
             <input type='hidden' name='dopost' value='saveedit'>
             <input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token']; ?>">
             <tr>
-              <td height="26" align="center">广告位标识：</td>
+              <td height="26">广告位标识：</td>
               <td colspan="2"><?php echo $row['tagname']; ?></td>
             </tr>
             <tr>
-              <td height="26" align="center">广告分类：</td>
-              <td colspan="2"><select name='clsid' style='width:150px' id="clsid">
+              <td height="26">广告分类：</td>
+              <td colspan="2">
+                <select name='clsid' id="clsid" style='width:160px'>
                   <option value='0'>默认分类</option>
                   <?php echo $option; ?>
                 </select></td>
             </tr>
             <tr>
-              <td width="15%" height="26" align="center">广告投放范围：</td>
+              <td width="15%" height="26">广告投放范围：</td>
               <td colspan="2"><?php
            	$tl = new TypeLink(0);
            	$typeOptions = $tl->GetOptionArray($row['typeid'],0,0);
@@ -77,43 +78,42 @@
             echo "</select>";
 			?>
                 <br>
-                （如果在所选栏目找不到指定标识的广告内容，系统会自动搜索父栏目）</td>
+              （如果在所选栏目找不到指定标识的广告内容，系统会自动搜索父栏目）</td>
             </tr>
             <tr>
-              <td height="26" align="center">广告位名称：</td>
-              <td colspan="2"><input name="adname" type="text" id="adname" size="30" value="<?php echo $row['adname']?>" class='iptxt' /></td>
+              <td height="26">广告位名称：</td>
+              <td colspan="2"><input name="adname" type="text" id="adname" value="<?php echo $row['adname']?>" class="iptxt" style="width:260px"></td>
             </tr>
             <tr>
-              <td height="26" align="center">时间限制：</td>
+              <td height="26">时间限制：</td>
               <td colspan="2">
-                <label><input class="np" name="timeset" type="radio" value="0"
-                  <?php if($row['timeset']==0) echo " checked='1' "; ?> />
+                <label><input class="np" name="timeset" type="radio" value="0" <?php if($row['timeset']==0) echo " checked='1' "; ?> />
                 永不过期</label>
-                <label><input class="np" type="radio" name="timeset" value="1"
-                  <?php if($row['timeset']==1) echo " checked='1' "; ?> />
-                在设内时间内有效</label></td>
+                <label><input class="np" type="radio" name="timeset" value="1" <?php if($row['timeset']==1) echo " checked='1' "; ?> />
+                在设内时间内有效</label>
+              </td>
             </tr>
             <tr>
-              <td height="26" align="center">投放时间：</td>
+              <td height="26">投放时间：</td>
               <td colspan="2">从
-                <input name="starttime" type="text" id="starttime" value="<?php echo GetDateTimeMk($row['starttime'])?>" class='iptxt datepicker' />
+                <input name="starttime" type="text" id="starttime" value="<?php echo GetDateTimeMk($row['starttime'])?>" class='iptxt datepicker' style="width:160px">
                 到
-                <input name="endtime" type="text" id="endtime" value="<?php echo GetDateTimeMk($row['endtime'])?>" class='iptxt datepicker' /></td>
+                <input name="endtime" type="text" id="endtime" value="<?php echo GetDateTimeMk($row['endtime'])?>" class='iptxt datepicker' style="width:160px">
+              </td>
             </tr>
             <tr>
-              <td height="80" align="center">正常显示内容：</td>
-              <td width="76%"><textarea name="normbody" rows="10" id="normbody" style="width:80%;height:100px"><?php echo dede_htmlspecialchars(stripslashes($row['normbody']))?></textarea>
+              <td height="80">正常显示内容：</td>
+              <td width="70%"><textarea name="normbody" rows="10" id="normbody" style="width:80%;height:100px"><?php echo dede_htmlspecialchars(stripslashes($row['normbody']))?></textarea>
               </td>
               <td width="9%"></td>
             </tr>
             <tr>
-              <td height="80" align="center">过期显示内容：</td>
+              <td height="80">过期显示内容：</td>
               <td><textarea name="expbody" rows="10" id="expbody" style="width:80%;height:100px"><?php echo dede_htmlspecialchars($row['expbody'])?></textarea></td>
               <td></td>
             </tr>
             <tr>
-              <td height="53" align="center"></td>
-              <td colspan="2"><button type="submit" class="btn btn-success">确定</button></td>
+              <td colspan="3" align="center" class="py-3"><button type="submit" class="btn btn-success">保存</button></td>
             </tr>
           </form>
         </table>

src/admin/templets/ad_main.htm

@@ -23,13 +23,13 @@
                 <table border='0' cellpadding='0' cellspacing='0' class="table table-borderless">
                   <tr>
                     <td width='90' align='center'>请选择分类：</td>
-                    <td width='124'><select name='clsid' style='width:150px' id="clsid">
+                    <td width='124'><select name='clsid' style='width:160px' id="clsid">
                       <option value='0'>默认分类</option>
                       <?php echo $option; ?>
                       </select>
                     </td>
                     <td width='70'> 关键词：</td>
-                    <td width='185'><input type='text' name='keyword' style='width:150px' /></td>
+                    <td width='185'><input type='text' name='keyword' style='width:160px' /></td>
                     <td width="130"><button type="submit" class="btn btn-success">搜索</button></td>
                   </tr>
                 </table>
@@ -63,7 +63,7 @@
       </td>
     </tr>
     {/dede:datalist}
-    <tr align="center" bgcolor="#f8f8f8" height="26">
+    <tr height="36" bgcolor="#f8f8f8" align="center">
       <td colspan="7">{dede:pagelist listsize='6'/}</td>
     </tr>
   </table>

src/admin/templets/adtype_main.htm

@@ -6,14 +6,14 @@
 <link rel="stylesheet" href="../static/web/css/admin.css">
 </head>
 <body>
-<table width="98%" border="0" align="center" cellpadding="3" cellspacing="1">
+<table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" class="table maintable mt-3">
   <form name="form1" action="adtype_main.php" method="post">
     <tr>
       <td height="26" background="../static/web/img/tbg.gif" colspan="7" style="padding-left:10px"><input type="hidden" name="dopost" value="save"/>广告分类管理&nbsp;<a href="ad_main.php">[广告管理]</a></td>
     </tr>
     <tr bgcolor="#FBFCE2">
-      <td width="9%" height="26" align="center" valign="top">类型ID</td>
-      <td width="55%" align="center" valign="top">广告分类</td>
+      <td width="9%" height="26" align="center">类型ID</td>
+      <td width="55%" align="center">广告分类</td>
       <td width="36%" align="center">状态</td>
     </tr>
     <?php
@@ -25,22 +25,20 @@
       $k++;
 	?>
     <tr align="center" bgcolor="#ffffff">
-      <td height="26" valign="top"><input type="hidden" name="ID_<?php echo $k?>" value="<?php echo $row->id?>"/><?php echo $row->id; ?></td>
-      <td height="26" valign="top"><input name="pname_<?php echo $k?>" value="<?php echo $row->typename?>" type="text" id="pname_<?php echo $k?>" class='pubinputs' style="width:90%"></td>
-      <td><input name="check_<?php echo $k?>" type="checkbox" id="check_<?php echo $k?>"  value="1" checked='1' class='np' />
-        保留 </td>
+      <td height="26"><input type="hidden" name="ID_<?php echo $k?>" value="<?php echo $row->id?>"/><?php echo $row->id; ?></td>
+      <td height="26"><input name="pname_<?php echo $k?>" value="<?php echo $row->typename?>" type="text" id="pname_<?php echo $k?>" class='pubinputs' style="width:90%"></td>
+      <td><input name="check_<?php echo $k?>" type="checkbox" id="check_<?php echo $k?>"  value="1" checked='1' class='np' /> 保留</td>
     </tr>
     <?php
 	}
 	?>
     <input type="hidden" name="idend" value="<?php echo $k?>">
     <tr bgcolor="#F8FCF1">
-      <td height="26" colspan="5" valign="top" bgcolor="#f8f8f8">新增一个广告类型：</td>
+      <td height="26" colspan="5" bgcolor="#f8f8f8">新增一个广告类型：</td>
     </tr>
     <tr height="26" align="center" bgcolor="#ffffff">
-      <td colspan="2" valign="top"><input name="pname_new" type="text" id="pname_new" class='pubinputs' style="width:90%"></td>
-      <td align="center" bgcolor="#ffffff"><input name="check_new" type="checkbox"  id="check_new" value="1" checked='1' class='np' />
-        新增 </td>
+      <td colspan="2"><input name="pname_new" type="text" id="pname_new" class='pubinputs' style="width:90%"></td>
+      <td align="center" bgcolor="#ffffff"><input name="check_new" type="checkbox"  id="check_new" value="1" checked='1' class='np' /> 新增 </td>
     </tr>
     <tr>
       <td height="30" colspan="5" align="center" bgcolor="#f8f8f8"><input name="imageField"  type="submit" class="np coolbg" value="确定"></td>

src/admin/templets/album_add.htm

@@ -161,7 +161,7 @@ table{border-collapse:separate}
                   <button id="btnClearAll" type="button" class="btn btn-sm btn-success delete">清空</button>
                   <label><input type='checkbox' class='np' name='ddisfirst' value='1' />&nbsp;使用图集的第一幅图</label>
               </td>
-              <td width="150" align="center"><img id="litPic" src="../static/web/img/defaultpic.jpg" style="height:80px"></td>
+              <td width="160" align="center"><img id="litPic" src="../static/web/img/defaultpic.jpg" style="height:80px"></td>
             </tr>
           </table>
         </td>
@@ -467,8 +467,8 @@ table{border-collapse:separate}
       </tr>
     </table>
     <table width="98%" border="0" cellspacing="0" cellpadding="0" align="center" bgcolor="#f8f8f8" style="border:1px solid #dee2e6;border-top:0" class="mb-3">
-      <tr height="36">
-        <td align="center" style="padding:.6rem">
+      <tr>
+        <td align="center" class="py-3">
           <button type="submit" class="btn btn-success">保存</button>
           <button type="button" onClick="location.reload();" class="btn btn-success">重置</button>
         </td>

src/admin/templets/album_edit.htm

@@ -517,8 +517,8 @@ table{border-collapse:separate}
     </tr>
   </table>
   <table width="98%" border="0" cellspacing="0" cellpadding="0" align="center" bgcolor="#f8f8f8" style="border:1px solid #dee2e6;border-top:0" class="mb-3">
-    <tr height="36">
-      <td align="center" style="padding:.6rem">
+    <tr>
+      <td align="center" class="py-3">
         <button type="submit" class="btn btn-success">保存</button>
         <button type="button" onClick="location.reload();" class="btn btn-success">重置</button>
       </td>

src/admin/templets/archives_add.htm

@@ -357,8 +357,8 @@ table{border-collapse:separate}
       </tr>
     </table>
     <table width="98%" border="0" cellspacing="0" cellpadding="0" align="center" bgcolor="#f8f8f8" style="border:1px solid #dee2e6;border-top:0" class="mb-3">
-      <tr height="36">
-        <td align="center" style="padding:.6rem">
+      <tr>
+        <td align="center" class="py-3">
           <button type="submit" class="btn btn-success">保存</button>
           <button type="button" onClick="location.reload();" class="btn btn-success">重置</button>
         </td>

src/admin/templets/archives_edit.htm

@@ -347,8 +347,8 @@ table{border-collapse:separate}
       </tr>
     </table>
     <table width="98%" border="0" cellspacing="0" cellpadding="0" align="center" bgcolor="#f8f8f8" style="border:1px solid #dee2e6;border-top:0" class="mb-3">
-      <tr height="36">
-        <td align="center" style="padding:.6rem">
+      <tr>
+        <td align="center" class="py-3">
           <button type="submit" class="btn btn-success">保存</button>
           <button type="button" onClick="location.reload();" class="btn btn-success">重置</button>
         </td>

src/admin/templets/archives_sg_add.htm

@@ -102,7 +102,7 @@ table{border-collapse:separate}
               <button type="button" name="Submit2" onclick="SelectImage('form1.picname','small');" class="btn btn-success btn-sm">选择图片</button>
               <button id="btnClearAll" type="button" class="btn btn-success btn-sm delete">清空</button>
              </td>
-            <td width="150" align="center"><img id="litPic" src="../static/web/img/defaultpic.jpg" style="height:80px"></td>
+            <td width="160" align="center"><img id="litPic" src="../static/web/img/defaultpic.jpg" style="height:80px"></td>
           </tr>
         </table>
       </td>
@@ -162,8 +162,8 @@ table{border-collapse:separate}
     </tr>
   </table>
   <table width="98%" border="0" cellspacing="0" cellpadding="0" align="center" bgcolor="#f8f8f8" style="border:1px solid #dee2e6;border-top:0" class="mb-3">
-    <tr height="36">
-      <td align="center" style="padding:.6rem">
+    <tr>
+      <td align="center" class="py-3">
         <button type="submit" class="btn btn-success">保存</button>
         <button type="button" onClick="location.reload();" class="btn btn-success">重置</button>
       </td>

src/admin/templets/archives_sg_edit.htm

@@ -164,8 +164,8 @@ table{border-collapse:separate}
    </tr>
   </table>
   <table width="98%" border="0" cellspacing="0" cellpadding="0" align="center" bgcolor="#f8f8f8" style="border:1px solid #dee2e6;border-top:0" class="mb-3">
-    <tr height="36">
-      <td align="center" style="padding:.6rem">
+    <tr>
+      <td align="center" class="py-3">
         <button type="submit" class="btn btn-success">保存</button>
         <button type="button" onClick="location.reload();" class="btn btn-success">重置</button>
       </td>

src/admin/templets/article_add.htm

@@ -151,7 +151,7 @@ table{border-collapse:separate}
                 <button type="button" name="Submit2" onClick="SelectImage('form1.picname','small');" class="btn btn-success btn-sm">选择图片</button>
                 <button id="btnClearAll" type="button" class="btn btn-success btn-sm delete">清空</button>
               </td>
-              <td width="150" align="center"><img id="litPic" src="../static/web/img/defaultpic.jpg" style="height:80px"></td>
+              <td width="160" align="center"><img id="litPic" src="../static/web/img/defaultpic.jpg" style="height:80px"></td>
             </tr>
           </table>
         </td>
@@ -282,7 +282,7 @@ table{border-collapse:separate}
         GetEditor("body",$body,450);
         ?>
         </td>
-        <td width="250" align="center" valign="top" bgcolor="#FFFFCC" id="mPic" style="display:none"></td>
+        <td width="250" align="center" bgcolor="#FFFFCC" id="mPic" style="display:none"></td>
       </tr>
     </table>
     <!--高级参数-->
@@ -404,8 +404,8 @@ table{border-collapse:separate}
       </tr>
     </table>
     <table width="98%" border="0" cellspacing="0" cellpadding="0" align="center" bgcolor="#f8f8f8" style="border:1px solid #dee2e6;border-top:0" class="mb-3">
-      <tr height="36">
-        <td align="center" style="padding:.6rem">
+      <tr>
+        <td align="center" class="py-3">
           <button type="submit" class="btn btn-success">保存</button>
           <button type="button" onClick="location.reload();" class="btn btn-success">重置</button>
         </td>

src/admin/templets/article_coonepage_rule.htm

@@ -132,7 +132,7 @@
 			</tr>
 		</form>
 		<tr align="right" bgcolor="#F3FAD3">
-			<td height="26" colspan="6" align="center">{dede:pagelist listsize='6'/}</td>
+			<td height="36" colspan="6" align="center">{dede:pagelist listsize='6'/}</td>
 		</tr>
 	</table>
 	<!--下面是隐藏的栏目增加修改表单-->
@@ -152,20 +152,16 @@
 				<tr>
 					<td height="30">原内容编码：</td>
 					<td colspan="2">
-						<label><input type="radio" name="lang" value="utf-8" checked="checked">
-							UTF-8</label>
-						<label>
-							<input type="radio" name="lang" value="gb2312">
-							GB2312/GBK</label>
+						<label><input type="radio" name="lang" value="utf-8" checked="checked"> UTF-8 </label>
+						<label><input type="radio" name="lang" value="gb2312"> GB2312/GBK</label>
 					</td>
 				</tr>
 				<tr>
 					<td height="30">用作文章来源：</td>
 					<td colspan="2">
-						<label><input type="radio" name="issource" value="0">
-							否</label>
-						<label><input name="issource" type="radio" value="1" checked="checked">
-							是</label></td>
+						<label><input type="radio" name="issource" value="0"> 否 </label>
+						<label><input name="issource" type="radio" value="1" checked="checked"> 是</label>
+					</td>
 				</tr>
 				<tr>
 					<td height="30">网站网址：</td>
@@ -185,8 +181,8 @@
 					<td colspan="2"><textarea name="rule" style="width:300px;height:80px">{@body}</textarea></td>
 				</tr>
 				<tr>
-					<td height="30"></td>
-					<td colspan="2"><button class="btn btn-success btn-sm" type="submit" name="Submit" value="">保存规则</button>
+					<td colspan="3" align="center" class="py-3">
+						<button class="btn btn-success btn-sm" type="submit" name="Submit" value="">保存规则</button>
 						<button type="reset" class="btn btn-success btn-sm" name="Submit2">重置</button>
 					</td>
 				</tr>

src/admin/templets/article_edit.htm

@@ -258,7 +258,7 @@ table{border-collapse:separate}
       </tr>
       <tr>
         <td width="100%"><?php GetEditor("body",stripcslashes($addRow['body']),450); ?></td>
-        <td width="250" align="center" valign="top" bgcolor="#FFFFCC" id="mPic" style="display:none"></td>
+        <td width="250" align="center" bgcolor="#FFFFCC" id="mPic" style="display:none"></td>
       </tr>
     </table>
     <!--高级参数-->
@@ -372,8 +372,8 @@ table{border-collapse:separate}
       </tr>
     </table>
     <table width="98%" border="0" cellspacing="0" cellpadding="0" align="center" bgcolor="#f8f8f8" style="border:1px solid #dee2e6;border-top:0" class="mb-3">
-      <tr height="36">
-        <td align="center" style="padding:.6rem">
+      <tr>
+        <td align="center" class="py-3">
           <button type="submit" class="btn btn-success">保存</button>
           <button type="button" onClick="location.reload();" class="btn btn-success">重置</button>
         </td>

src/admin/templets/article_keywords_main.htm

@@ -36,7 +36,7 @@
               <form name='form1' action="article_keywords_main.php">
                 <td width="75%" align="right">
                   搜索：<input type='text' name='keyword' size='20' />&nbsp;
-                  <button type='submit' name='sb' value='' class="btn btn-success btn-sm">确定</button>
+                  <button type='submit' name='sb' value='' class="btn btn-success btn-sm">保存</button>
                   <button class="btn btn-success btn-sm" name="n1" type="button" id="n1" onClick="location='article_keywords_make.php';">分析系统内的关键词</button>
                   <button class="btn btn-success btn-sm" name="n11" type="button" id="n11" onClick="location='search_keywords_main.php';">管理搜索的关键词</button>
                 </td>
@@ -100,14 +100,14 @@
         </tr>
         {/dede:datalist}
         <tr bgcolor="#ffffff">
-          <td height="26" colspan="6">
+          <td colspan="6" class="py-3">
             <button type="button" name="dl1" class="btn btn-success btn-sm" onClick="selAll()">反选</button>
-            <button type="button" name="dl2" class="btn btn-success btn-sm" onClick="this.form.submit();">保存修改</button>
+            <button type="button" name="dl2" class="btn btn-success btn-sm" onClick="this.form.submit();">保存保存</button>
           </td>
         </tr>
       </form>
       <tr align="center" bgcolor="#f8f8f8">
-        <td height="26" colspan="6">{dede:pagelist listsize='6'/}</td>
+        <td height="36" colspan="6">{dede:pagelist listsize='6'/}</td>
       </tr>
     </table>
   </div>

src/admin/templets/article_keywords_select.htm

@@ -94,7 +94,7 @@ function AddNewKw()
         </td>
       </tr>
       <tr align="center">
-        <td height="26" bgcolor="#f8f8f8">{dede:pagelist listsize='6'/}</td>
+        <td height="36" bgcolor="#f8f8f8">{dede:pagelist listsize='6'/}</td>
       </tr>
     </form>
   </table>

src/admin/templets/cards_type.htm

@@ -15,8 +15,8 @@
         <td height="26" colspan="4" background="../static/web/img/tbg.gif">点卡产品分类</td>
       </tr>
       <tr bgcolor="#FBFCE2">
-        <td width="30%" height="26" align="center" valign="top">产品名称</td>
-        <td width="27%" align="center" valign="top">点数(金币数)</td>
+        <td width="30%" height="26" align="center">产品名称</td>
+        <td width="27%" align="center">点数(金币数)</td>
         <td width="30%" align="center">价格</td>
         <td width="17%" align="center">状态</td>
       </tr>
@@ -30,10 +30,10 @@
 	?>
       <input type="hidden" name="ID_<?php echo $k?>" value="<?php echo $row->tid?>">
       <tr align="center" bgcolor="#ffffff">
-        <td height="26" valign="top">
+        <td height="26">
           <input name="pname_<?php echo $k?>" value="<?php echo $row->pname?>" type="text" id="pname_<?php echo $k?>" class='pubinputs' style="width:90%">
         </td>
-        <td height="26" valign="top">
+        <td height="26">
           <input name="num_<?php echo $k?>" value="<?php echo $row->num?>" type="text" id="num_<?php echo $k?>" class='pubinputs' style="width:80%">
         </td>
         <td>
@@ -51,17 +51,17 @@
 	?>
       <input type="hidden" name="idend" value="<?php echo $k?>">
       <tr bgcolor="#F8FCF1">
-        <td height="26" colspan="4" valign="top" bgcolor="#f8f8f8" style="padding-left:10px">
+        <td height="26" colspan="4" bgcolor="#f8f8f8" style="padding-left:10px">
           新增一个点卡产品类型：</td>
       </tr>
       <tr height="26" align="center" bgcolor="#ffffff">
-        <td valign="top">
+        <td>
           <input name="pname_new" type="text" id="pname_new" class='pubinputs' style="width:90%">
         </td>
-        <td valign="top">
+        <td>
           <input name="num_new" value="100" type="text" id="num_new" class='pubinputs' style="width:80%">
         </td>
-        <td valign="top">
+        <td>
           <input name="money_new" type="text" id="money_new" class='pubinputs' style='width:80%' value="30">
           （元）
         </td>
@@ -70,8 +70,8 @@
           新增 </td>
       </tr>
       <tr>
-        <td height="30" colspan="4" align="center" bgcolor="#f8f8f8">
-          <button type="submit" class="btn btn-success">确定</button>
+        <td colspan="4" align="center" bgcolor="#f8f8f8" class="py-3">
+          <button type="submit" class="btn btn-success">保存</button>
         </td>
       </tr>
     </form>

src/admin/templets/catalog_add.htm

@@ -10,7 +10,6 @@
 <script src="js/main.js"></script>
 <style>
 textarea{min-height:30px}
-.table{margin-bottom:0}
 </style>
 <script>
 var channelArray = new Array();
@@ -116,7 +115,7 @@ function CheckCross() {
 <body>
   <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" bordercolor="#cfcfcf" class="mt-3">
     <tr>
-      <td width="100%" height="26" valign="top">
+      <td width="100%" height="26">
         <table width="100%" border="0" cellspacing="0" cellpadding="0">
           <tr>
             <td height="30"><img src="../static/web/img/book1.gif"><a href="catalog_main.php">栏目管理</a> &gt; 增加栏目</td>
@@ -142,15 +141,15 @@ function CheckCross() {
           echo " <input type='hidden' name='sitepath' value='{$myrow['sitepath']}'>";
         }
         ?>
-        <td height="95" align="center" bgcolor="#fff">
+        <td height="90" align="center" bgcolor="#fff">
           <table width="100%" border="0" cellspacing="0" id="head1" cellpadding="0">
             <tr>
               <td colspan="2" bgcolor="#fff" align="left">
                 <table border="0" cellpadding="0" cellspacing="0">
                   <tr>
-                    <td width="84" height="26" 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>
+                    <td width="86" height="26" 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>
                   </tr>
                 </table>
               </td>
@@ -161,9 +160,9 @@ function CheckCross() {
               <td colspan="2" bgcolor="#fff" style="text-align:left">
                 <table height="26" border="0" cellpadding="0" cellspacing="0">
                   <tr>
-                    <td width="84" align="center" background="../static/web/img/itemnote2.gif" bgcolor="#F2F7DF"><a href="javascript:;" onClick="ShowItem1()">常规选项</a></td>
-                    <td width="84" 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>
+                    <td width="86" align="center" background="../static/web/img/itemnote2.gif" bgcolor="#F2F7DF"><a href="javascript:;" onClick="ShowItem1()">常规选项</a></td>
+                    <td width="86" 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>
                   </tr>
                 </table>
               </td>
@@ -174,24 +173,24 @@ function CheckCross() {
               <td colspan="2" bgcolor="#fff" style="text-align:left">
                 <table height="26" border="0" cellpadding="0" cellspacing="0">
                   <tr>
-                    <td width="84" align="center" background="../static/web/img/itemnote2.gif" bgcolor="#F2F7DF"><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" align="center" background="../static/web/img/itemnote1.gif">栏目内容</td>
+                    <td width="86" align="center" background="../static/web/img/itemnote2.gif" bgcolor="#F2F7DF"><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" align="center" background="../static/web/img/itemnote1.gif">栏目内容</td>
                   </tr>
                 </table>
               </td>
             </tr>
           </table>
-          <table width="100%" border="0" id="needset" cellspacing="0" cellpadding="0" style="text-align:left;border:1px solid #dee2e6;background:#fff" class="table">
+          <table width="100%" border="0" id="needset" cellspacing="0" cellpadding="0" style="border:1px solid #dee2e6" class="table mb-0">
             <tr>
-              <td width="150" class="bline" height="26" style="padding-left:10px">是否支持投稿：</td>
+              <td width="160" class="bline" height="26" style="padding-left:10px">是否支持投稿：</td>
               <td class="bline">
                 <label><input type='radio' name='issend' value='0' class='np' <?php if($issend==0) echo " checked='checked' "; ?>>&nbsp;不支持&nbsp;</label>
                 <label><input type='radio' name='issend' value='1' class='np' <?php if($issend==1) echo " checked='checked' "; ?>>&nbsp;支持</label>
               </td>
             </tr>
             <tr>
-              <td width="150" class="bline" height="26" style="padding-left:10px">是否隐藏栏目：</td>
+              <td width="160" class="bline" height="26" style="padding-left:10px">是否隐藏栏目：</td>
               <td class="bline">
                 <label><input type='radio' name='ishidden' value='0' class='np' checked="checked">&nbsp;显示&nbsp;</label>
                 <label><input type='radio' name='ishidden' value='1' class='np'>&nbsp;隐藏</label>
@@ -373,13 +372,13 @@ function CheckCross() {
               </td>
             </tr>
           </table>
-          <table width="100%" border="0" cellspacing="0" cellpadding="0" style="border:1px solid #dee2e6;background:#fff;display:none;text-align:left" id="adset" class="table">
+          <table width="100%" border="0" cellspacing="0" cellpadding="0" style="display:none;border:1px solid #dee2e6" id="adset" class="table mb-0">
             <?php
             if($id==0)
             {
             ?>
             <tr>
-              <td class="bline" width="150" height="26" style="padding-left:10px">多站点支持：</td>
+              <td class="bline" width="160" height="26" style="padding-left:10px">多站点支持：</td>
               <td class="bline">
                 <label><input name="moresite" type="radio" class="np" value="0" checked="checked">&nbsp;不启用&nbsp;</label>
                 <label><input type="radio" name="moresite" class="np" value="1">&nbsp;启用</label>
@@ -484,7 +483,7 @@ function CheckCross() {
               <td height="60"><textarea name="description" cols="70" rows="4" id="description" class="alltxt"></textarea></td>
             </tr>
           </table>
-          <table width="100%" border="0" cellspacing="0" cellpadding="0" style="border:1px solid #dee2e6;background:#fff;display:none;text-align:left" id="ctset" class="table">
+          <table width="100%" border="0" cellspacing="0" cellpadding="0" style="display:none;border:1px solid #dee2e6" id="ctset" class="table mb-0">
             <tr>
               <td height="26" style="padding-left:10px">说明：栏目内容是替代原来栏目单独页的更灵活的一种方式，可在栏目模板中用{dede:field.content/}调用，通常用于企业简介之类的用途</td>
             </tr>
@@ -498,8 +497,8 @@ function CheckCross() {
           </table>
           <table width="100%" border="0" cellspacing="0" cellpadding="0" bgcolor="#f8f8f8" style="border:1px solid #dee2e6;border-top:0" class="mb-3">
             <tr>
-              <td align="center" style="padding:.6rem">
-                <button type="submit" class="btn btn-success">确定</button>
+              <td align="center" class="py-3">
+                <button type="submit" class="btn btn-success">保存</button>
                 <a href="catalog_main.php" class="btn btn-success">返回</a>
               </td>
             </tr>

src/admin/templets/catalog_add_quick.htm

@@ -75,12 +75,7 @@
   </script>
 	<link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
 	<link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
-  <link rel='stylesheet' href='../static/web/css/admin.css'>
-  <style>
-    .table {
-      margin: 0;
-    }
-  </style>
+  <link rel="stylesheet" href="../static/web/css/admin.css">
 </head>
 <body>
   <form name="form1" action="catalog_add.php" method="post">
@@ -88,7 +83,7 @@
     <input type="hidden" name="savetype" value="" id="savetype">
     <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" bordercolor="#111111" style="border-collapse:collapse" class="mt-3">
       <tr>
-        <td width="100%" height="26" valign="top">
+        <td width="100%" height="26">
           <table width="100%" border="0" cellspacing="0" cellpadding="0">
             <tr>
               <td height="30"><img height='14' src='../static/web/img/book1.gif' width='20' />&nbsp;<a href="catalog_main.php">栏目管理</a> &gt; 批量增加栏目</td>
@@ -105,7 +100,7 @@
         <td height="10"></td>
       </tr>
       <tr>
-        <td height="95" align="left" bgcolor="#ffffff">
+        <td height="90" align="left" bgcolor="#ffffff">
           <table width="100%" border="0" cellspacing="0" id="head1" cellpadding="0">
             <tr>
               <td colspan="2" bgcolor="#ffffff">
@@ -117,14 +112,14 @@
               </td>
             </tr>
           </table>
-          <table width="100%" border="0" id="needset" cellspacing="0" cellpadding="0" style="border:1px solid #dee2e6" class="table">
+          <table width="100%" border="0" id="needset" cellspacing="0" cellpadding="0" style="border:1px solid #dee2e6" class="table mb-0">
             <tr>
               <td height="26" bgcolor="#f8f8f8" style="padding-left:10px">公用参数：</td>
               <td bgcolor="#f8f8f8"></td>
             </tr>
             <tr>
-              <td width="150" class='bline' height="26" style="padding-left:10px">是否支持投稿：</td>
-              <td class='bline'>
+              <td width="160" class="bline" height="26" style="padding-left:10px">是否支持投稿：</td>
+              <td class="bline">
                 <label><input type='radio' name='issend' value='0' class='np' />
                 不支持</label>
                 &nbsp;
@@ -132,8 +127,8 @@
                 支持</label> </td>
             </tr>
             <tr>
-              <td class='bline' height="26" style="padding-left:10px">目录保存位置：</td>
-              <td class='bline'>
+              <td class="bline" height="26" style="padding-left:10px">目录保存位置：</td>
+              <td class="bline">
                 <input name="referpath" type="radio" id="truepath1" class="np" value="parent" checked='1' />
                 <label for="truepath1">默认HMTL目录（
                 <?php
@@ -150,8 +145,8 @@
                 </td>
             </tr>
             <tr>
-              <td class='bline' height="26" style="padding-left:10px">隶属栏目：</td>
-              <td class='bline'>
+              <td class="bline" height="26" style="padding-left:10px">隶属栏目：</td>
+              <td class="bline">
                 <select name='reid' onchange="showSeltype(this)">
                   <option value='0'>选择所属目录</option>
                   <?php echo $typeOptions; ?>
@@ -159,8 +154,8 @@
               </td>
             </tr>
             <tr>
-              <td class='bline' height="26" style="padding-left:10px">内容模型：&nbsp; </td>
-              <td class='bline'><select name="channeltype" id="channeltype" style="width:260px" onChange="ParTemplet(this)">
+              <td class="bline" height="26" style="padding-left:10px">内容模型：&nbsp; </td>
+              <td class="bline"><select name="channeltype" id="channeltype" style="width:260px" onChange="ParTemplet(this)">
                 <?php
                 foreach($channelArray as $k=>$arr)
                 {
@@ -172,8 +167,8 @@
               </td>
             </tr>
             <tr>
-              <td class='bline' height="26" style="padding-left:10px">栏目列表选项：</td>
-              <td class='bline'>
+              <td class="bline" height="26" style="padding-left:10px">栏目列表选项：</td>
+              <td class="bline">
                 <label><input type='radio' name='isdefault' value='1' class='np' checked='1' />
                 链接到默认页</label>
                 <label><input type='radio' name='isdefault' value='0' class='np' />
@@ -183,8 +178,8 @@
               </td>
             </tr>
             <tr>
-              <td class='bline' height="26" style="padding-left:10px">默认页的名称：</td>
-              <td class='bline'><input name="defaultname" type="text" value="index.html" class="pubinputs"></td>
+              <td class="bline" height="26" style="padding-left:10px">默认页的名称：</td>
+              <td class="bline"><input name="defaultname" type="text" value="index.html" class="pubinputs"></td>
             </tr>
             <tr id='helpvar2' style='display:none'>
               <td height="26" bgcolor="#F3F7EA" style="padding-left:10px">支持变量：</td>
@@ -198,8 +193,8 @@
               </td>
             </tr>
             <tr>
-              <td height="26" class='bline' style="padding-left:10px">文章命名规则：</td>
-              <td class='bline'><input name="namerule" type="text" id="namerule" value="{typedir}/{Y}{M}{D}/{aid}.html"
+              <td height="26" class="bline" style="padding-left:10px">文章命名规则：</td>
+              <td class="bline"><input name="namerule" type="text" id="namerule" value="{typedir}/{Y}{M}{D}/{aid}.html"
                   size="40" class="pubinputs">
                 <img src="../static/web/img/help.gif" alt="帮助" border="0" style="cursor:pointer" onClick="ShowHide('helpvar2')"></td>
             </tr>
@@ -276,8 +271,8 @@
           </table>
           <table width="100%" border="0" cellspacing="0" cellpadding="0" bgcolor="#f8f8f8" style="border:1px solid #dee2e6;border-top:0" class="mb-3">
             <tr>
-              <td align="center" height="36" style="padding:.6rem">
-                <button type="submit" class="btn btn-success">确定</button>
+              <td align="center" class="py-3">
+                <button type="submit" class="btn btn-success">保存</button>
                 <a href="catalog_main.php" class="btn btn-success">返回</a>
               </td>
             </tr>

src/admin/templets/catalog_edit.htm

@@ -11,7 +11,6 @@
 <script src="js/main.js"></script>
 <style>
 textarea{min-height:30px}
-.table{margin-bottom:0}
 </style>
 <script>
 var channelArray = new Array();
@@ -106,7 +105,7 @@ function CheckCross() {
 <body>
   <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" bordercolor="#cfcfcf" class="mt-3">
     <tr>
-      <td width="100%" height="26" valign="top">
+      <td width="100%" height="26">
         <table width="100%" border="0" cellspacing="0" cellpadding="0">
           <tr>
             <td height="30"><img src="../static/web/img/book1.gif"><a href="catalog_main.php">栏目管理</a> &gt; 修改栏目</td>
@@ -124,15 +123,15 @@ function CheckCross() {
         <input type="hidden" name="dopost" value="save">
         <input type="hidden" name="id" value="<?php echo $id; ?>">
         <input type="hidden" name="topid" value="<?php echo $myrow['topid']; ?>">
-        <td height="95" align="center" bgcolor="#fff">
+        <td height="90" align="center" bgcolor="#fff">
           <table width="100%" border="0" cellspacing="0" id="head1" cellpadding="0">
             <tr>
               <td colspan="2" bgcolor="#fff" align="left">
                 <table border="0" cellpadding="0" cellspacing="0">
                   <tr>
-                    <td width="84" height="26" 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>
+                    <td width="86" height="26" 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>
                   </tr>
                 </table>
               </td>
@@ -143,9 +142,9 @@ function CheckCross() {
               <td colspan="2" bgcolor="#fff" style="text-align:left">
                 <table height="26" border="0" cellpadding="0" cellspacing="0">
                   <tr>
-                    <td width="84" align="center" background="../static/web/img/itemnote2.gif" bgcolor="#F2F7DF"><a href="javascript:;" onClick="ShowItem1()">常规选项</a></td>
-                    <td width="84" 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>
+                    <td width="86" align="center" background="../static/web/img/itemnote2.gif" bgcolor="#F2F7DF"><a href="javascript:;" onClick="ShowItem1()">常规选项</a></td>
+                    <td width="86" 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>
                   </tr>
                 </table>
               </td>
@@ -156,24 +155,24 @@ function CheckCross() {
               <td colspan="2" bgcolor="#fff" style="text-align:left">
                 <table height="26" border="0" cellpadding="0" cellspacing="0">
                   <tr>
-                    <td width="84" align="center" background="../static/web/img/itemnote2.gif" bgcolor="#F2F7DF"><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" align="center" background="../static/web/img/itemnote1.gif">栏目内容</td>
+                    <td width="86" align="center" background="../static/web/img/itemnote2.gif" bgcolor="#F2F7DF"><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" align="center" background="../static/web/img/itemnote1.gif">栏目内容</td>
                   </tr>
                 </table>
               </td>
             </tr>
           </table>
-          <table width="100%" border="0" id="needset" cellspacing="0" cellpadding="0" style="border:1px solid #dee2e6;background:#fff;text-align:left;" class="table">
+          <table width="100%" border="0" id="needset" cellspacing="0" cellpadding="0" style="border:1px solid #dee2e6" class="table mb-0">
             <tr>
-              <td width="150" class="bline" height="26" style="padding-left:10px">是否支持投稿：</td>
+              <td width="160" class="bline" height="26" style="padding-left:10px">是否支持投稿：</td>
               <td class="bline">
                 <label><input type='radio' name='issend' value='0' class='np' <?php if($myrow['issend']=="0") echo " checked='1' "; ?>>&nbsp;不支持&nbsp;</label>
                 <label><input type='radio' name='issend' value='1' class='np' <?php if($myrow['issend']=="1") echo " checked='1' "; ?>>&nbsp;支持</label>
               </td>
             </tr>
             <tr>
-              <td width="150" class="bline" height="26" style="padding-left:10px">是否隐藏栏目：</td>
+              <td width="160" class="bline" height="26" style="padding-left:10px">是否隐藏栏目：</td>
               <td class="bline">
                 <label><input type='radio' name='ishidden' value='0' class='np' <?php if($myrow['ishidden']=="0") echo " checked='1' "; ?>>&nbsp;显示&nbsp;</label>
                 <label><input type='radio' name='ishidden' value='1' class='np' <?php if($myrow['ishidden']=="1") echo " checked='1' "; ?>>&nbsp;隐藏</label>
@@ -313,9 +312,9 @@ function CheckCross() {
               </td>
             </tr>
           </table>
-          <table width="100%" border="0" cellspacing="0" cellpadding="0" style="border:1px solid #dee2e6;background:#fff;display:none;text-align:left" id="adset" class="table">
+          <table width="100%" border="0" cellspacing="0" cellpadding="0" style="display:none;border:1px solid #dee2e6" id="adset" class="table mb-0">
             <tr>
-              <td class="bline" width="150" height="26" style="padding-left:10px">多站点支持：</td>
+              <td class="bline" width="160" height="26" style="padding-left:10px">多站点支持：</td>
               <td class="bline">
                 <label><input name="moresite" type="radio" class="np" value="0" <?php if($myrow['moresite']==0) echo " checked='1' "; ?>>&nbsp;不启用&nbsp;</label>
                 <label><input type="radio" name="moresite" class="np" value="1" <?php if($myrow['moresite']==1) echo " checked='1' "; ?>>&nbsp;启用</label>
@@ -419,7 +418,7 @@ function CheckCross() {
               </td>
             </tr>
           </table>
-          <table width="100%" border="0" cellspacing="0" cellpadding="0" style="border:1px solid #dee2e6;background:#fff;display:none;text-align:left" id="ctset" class="table">
+          <table width="100%" border="0" cellspacing="0" cellpadding="0" style="display:none;border:1px solid #dee2e6" id="ctset" class="table mb-0">
             <tr>
               <td height="26">说明：栏目内容是替代原来栏目单独页的更灵活的一种方式，可在栏目模板中用{dede:field.content/}调用，通常用于企业简介之类的用途</td>
             </tr>
@@ -433,8 +432,8 @@ function CheckCross() {
           </table>
           <table width="100%" border="0" cellspacing="0" cellpadding="0" bgcolor="#f8f8f8" style="border:1px solid #dee2e6;border-top:0" class="mb-3">
             <tr>
-              <td align="center" style="padding:.6rem">
-                <button type="submit" class="btn btn-success">确定</button>
+              <td align="center" class="py-3">
+                <button type="submit" class="btn btn-success">保存</button>
                 <a href="catalog_main.php" class="btn btn-success">返回</a>
               </td>
             </tr>

src/admin/templets/catalog_main.htm

@@ -113,7 +113,7 @@ td,th{padding:.25rem}
 <body onLoad="ContextMenu.intializeContextMenu()">
 <table width="98%" border="0" cellpadding="3" cellspacing="1" align="center" class="maintable mt-3">
 <tr>
-  <td height="26" style="background:#f8f8f8">
+  <td height="26" style="background:#f8f8f8;border: 1px solid #dee2e6">
     <span style="float:left;padding-left:10px;line-height:26px" class="py-3">网站栏目管理</span>
     <span style="float:right;padding-right:10px" class="py-3">
    	  <a href="catalog_add.php?listtype=all" class="btn btn-success btn-sm">增加顶级栏目</a>
@@ -140,7 +140,7 @@ td,th{padding:.25rem}
 </tr>
 <form name="form1" method="post" action="catalog_do.php?dopost=upRankAll">
 <tr>
-<td bgcolor="#ffffff" valign="top">
+<td bgcolor="#ffffff">
 <?php
 if(empty($opendir)) $opendir=-1;
 if($userChannel>0) $opendir=$userChannel;
@@ -151,7 +151,7 @@ $tu->ListAllType($userChannel,$opendir);
 </tr>
 </form>
 <tr>
-  <td height="36" align="right" class="py-3" style="padding-right:10px;background:#f8f8f8">
+  <td align="right" class="py-3" style="padding-right:10px;background:#f8f8f8;border: 1px solid #dee2e6">
     <button type="button" name="sb1" class="btn btn-success btn-sm" onClick="document.form1.submit();">更新排序</button>
     <button type="button" name="sb4" class="btn btn-success btn-sm" onClick="location='makehtml_js.php';">更新脚本</button>
 		<button type="button" name="sb2" class="btn btn-success btn-sm" onClick="location='makehtml_list.php';">更新栏目</button>

src/admin/templets/content_att.htm

@@ -55,8 +55,8 @@
         <td height="26" colspan="3" bgcolor="#f8f8f8"></td>
       </tr>
       <tr>
-        <td height="30" colspan="3" align="center" bgcolor="#ffffff">
-          <button type="submit" class="btn btn-success">确定</button>
+        <td bgcolor="#ffffff" colspan="3" align="center" class="py-3">
+          <button type="submit" class="btn btn-success">保存</button>
         </td>
       </tr>
     </form>

src/admin/templets/content_i_list.htm

@@ -108,7 +108,7 @@ img{margin-right:0}
 	</form>
 	<table width="98%" border="0" cellspacing="1" cellpadding="1" align="center" class="mb-3">
 		<tr>
-			<td height="36" colspan="10" class="py-3" style="background:#fff">
+			<td colspan="10" class="py-3" style="margin-left:10px">
 				<a href="javascript:selAll()" class="btn btn-success btn-sm">全选</a>
 				<a href="javascript:noSelAll()" class="btn btn-success btn-sm">取消</a>
 				<a href="javascript:viewArc(0)" class="btn btn-success btn-sm">查看</a>
@@ -123,7 +123,7 @@ img{margin-right:0}
 			</td>
 		</tr>
 		<tr>
-			<td height="36" colspan="10" align="center" class="py-3" style="background:#f8f8f8">{dede:pagelist listsize='6'/}</td>
+			<td colspan="10" align="center" class="py-3" style="background:#f8f8f8">{dede:pagelist listsize='6'/}</td>
 		</tr>
 	</table>
 </body>

src/admin/templets/content_list.htm

@@ -106,7 +106,7 @@
 			</tr>
 			{/dede:datalist}
 			<tr>
-				<td height="36" colspan="10" style="margin-left:10px;background:#fff">
+				<td colspan="10" class="py-3" style="margin-left:10px">
 					<a href="javascript:selAll()" class="btn btn-success btn-sm">全选</a>
 					<a href="javascript:noSelAll()" class="btn btn-success btn-sm">取消</a>
 					<a href="javascript:updateArc(0)" class="btn btn-success btn-sm">更新</a>

src/admin/templets/content_s_list.htm

@@ -167,7 +167,7 @@ function noSelAll() {
 			</tr>
 			{/dede:datalist}
 			<tr>
-				<td height="36" colspan="9" style="margin-left:10px;background:#fff">
+				<td colspan="9" class="py-3" style="margin-left:10px">
 					<a href="javascript:selAll()" class="btn btn-success btn-sm">全选</a>
 					<a href="javascript:noSelAll()" class="btn btn-success btn-sm">取消</a>
 					<a href="javascript:viewArc(0)" class="btn btn-success btn-sm">查看</a>

src/admin/templets/content_select_list.htm

@@ -86,7 +86,7 @@
 			</tr>
 		</form>
 		<tr align="right" bgcolor="#EEF4EA">
-			<td height="26" colspan="9" align="center">{dede:pagelist listsize='6'/}</td>
+			<td height="36" colspan="9" align="center">{dede:pagelist listsize='6'/}</td>
 		</tr>
 	</table>
 	<table width='100%' align="center" border='0' cellpadding='1' cellspacing='1' bgcolor='#CBD8AC' class="table maintable table-borderless">
@@ -98,13 +98,13 @@
 						<tr>
 							<td width='160' align='center'>请选择类目：</td>
 							<td width='160'>
-								<select name='cid' style='width:150px'>
+								<select name='cid' style='width:160px'>
 									<option value='0'>选择分类</option>
 									<?php echo $optionarr?>
 								</select>
 							</td>
 							<td width='100'>关键词：</td>
-							<td width='160'><input type='text' name='keyword' value='<?php echo $keyword?>' style='width:150px'></td>
+							<td width='160'><input type='text' name='keyword' value='<?php echo $keyword?>' style='width:160px'></td>
 							<td width='100'><button type="submit" class="btn btn-success btn-sm">搜索</button></td>
 						</tr>
 					</table>

src/admin/templets/content_sg_list.htm

@@ -216,7 +216,7 @@
 			</tr>
 			{/dede:datalist}
 			<tr bgcolor="#ffffff">
-				<td height="26" colspan="9">
+				<td colspan="9" class="py-3" style="margin-left:10px">
 					<a class="btn btn-success btn-sm" href="javascript:selAll()" class="coolbg">全选</a>
 					<a class="btn btn-success btn-sm" href="javascript:noSelAll()" class="coolbg">取消</a>
 					<a class="btn btn-success btn-sm" href="javascript:updateArc(0)" class="coolbg">更新</a>
@@ -235,7 +235,7 @@
 			</tr>
 		</form>
 		<tr align="right" bgcolor="#f8f8f8">
-			<td height="26" colspan="9" align="center">{dede:pagelist listsize='6'/}</td>
+			<td height="36" colspan="9" align="center">{dede:pagelist listsize='6'/}</td>
 		</tr>
 	</table>
 </body>

src/admin/templets/content_tj.htm

@@ -13,7 +13,7 @@
       </td>
     </tr>
     <tr> 
-    <td height="250" colspan="2" align="center" valign="top" bgcolor="#ffffff">
+    <td height="250" colspan="2" align="center" bgcolor="#ffffff">
 	   <table width="98%" border="0" cellspacing="0" cellpadding="0">
         <tr><td height="10"></td></tr>
       </table>
@@ -23,7 +23,7 @@
           <td><table width="300" border="0" cellpadding="1" cellspacing="1" bgcolor="#996666">
               <tr bgcolor="#ffffff"> 
                 <td width="140" bgcolor="#F3ECDA">&nbsp;文档总数：</td>
-                <td width="150">[<?php echo $row1['dd']?>]</td>
+                <td width="160">[<?php echo $row1['dd']?>]</td>
               </tr>
               <tr bgcolor="#ffffff"> 
                 <td bgcolor="#F3ECDA">&nbsp;评论总数：</td>

src/admin/templets/diy_add.htm

@@ -101,13 +101,9 @@
         <td height="26" colspan="2">
           <table width="100%" border="0" cellspacing="0" cellpadding="0" class="table-borderless">
             <tr>
-              <td width="30%" height="36"></td>
-              <td width="15%">
-                <button type="submit" name="button" id="button" class='btn btn-success'>确定</button>
-              </td>
-              <td width="59%">
-                <button type="button" class='btn btn-success' id="button2" onclick="location='diy_main.php';"
-                >返回</button>
+              <td align="center" class="py-3">
+                <button type="submit" name="button" id="button" class='btn btn-success'>保存</button>
+                <button type="button" class='btn btn-success' id="button2" onclick="location='diy_main.php';">返回</button>
               </td>
             </tr>
           </table>

src/admin/templets/diy_edit.htm

@@ -178,13 +178,9 @@ foreach($dtp->CTags as $ctag)
         <td height="26" colspan="2">
           <table width="100%" border="0" cellspacing="0" cellpadding="0" class="table-borderless">
             <tr>
-              <td width="30%" height="36"></td>
-              <td width="15%">
-                <button type="submit" name="button" id="button" class='btn btn-success'>确定</button>
-              </td>
-              <td width="59%">
-                <button type="button" class='btn btn-success' id="button2" onclick="location='diy_main.php';"
-                >返回</button>
+              <td align="center" class="py-3">
+                <button type="submit" name="button" id="button" class='btn btn-success'>保存</button>
+                <button type="button" class='btn btn-success' id="button2" onclick="location='diy_main.php';">返回</button>
               </td>
             </tr>
           </table>

src/admin/templets/diy_edit_content.htm

@@ -15,7 +15,7 @@
     <td width="100%" height="26" colspan="2" background="../static/web/img/tbg.gif"><a href="<?php echo $ENV_GOBACK_URL; ?>">表单管理</a> &gt; 编辑评论</td>
   </tr>
   <tr>
-    <td height="167" colspan="2" align="center" bgcolor="#ffffff" valign="top">
+    <td height="167" colspan="2" align="center" bgcolor="#ffffff">
 	<form name="form1" method="post" enctype="multipart/form-data" action="diy_list.php?action=edit&diyid=<?php echo $diy->diyid ?>&id=<?php echo $row['id'] ?>&do=2">
 	<input type="hidden" name="dopost" value="edit">
 	<input type="hidden" name="id" value="<?php echo $row['id']; ?>">
@@ -45,8 +45,8 @@
 		echo "<input type='hidden' name='dede_fields' value='".$formfields."'>";
 		?>
           <tr bgcolor="#ffffff"> 
-            <td height="36" width='600' colspan="2" align="center">
-               <button type="submit" name="Submit1" class='btn btn-success'>保存修改</button>
+            <td align="center" class="py-3">
+               <button type="submit" name="Submit1" class='btn btn-success'>保存保存</button>
                <button type="button" name="Submit2" class='btn btn-success' onClick="location='<?php echo $ENV_GOBACK_URL; ?>';">不理返回</button>
 			 				</td>
           </tr>

src/admin/templets/diy_field_add.htm

@@ -162,9 +162,10 @@ td{ padding:6px; padding-left:6px; line-height:26px }
       <td height="26" colspan="2" bgcolor="#F9FDF0">
 	     <table width="100%" border="0" cellspacing="0" cellpadding="0" class="table table-borderless">
           <tr> 
-            <td width="30%" height="36"></td>
-            <td width="10%"><button type="submit" class="btn btn-success">确定</button></td>
-            <td><button type="reset" class="btn btn-success">重置</button></td>
+            <td align="center" class="py-3">
+              <button type="submit" class="btn btn-success">保存</button>
+              <button type="reset" class="btn btn-success">重置</button>
+            </td>
           </tr>
         </table>
       </td>

src/admin/templets/diy_field_edit.htm

@@ -151,9 +151,10 @@ td{ padding:6px; padding-left:6px; }
       <td height="26" colspan="2" bgcolor="#f8f8f8">
         <table width="100%" border="0" cellspacing="0" cellpadding="0" class="table table-borderless mb-3">
           <tr>
-            <td width="30%" height="36"></td>
-            <td width="10%" class="py-3"><button type="submit" class="btn btn-success">确定</button></td>
-            <td class="py-3"><button type="reset" class="btn btn-success">重置</button></td>
+            <td align="center" class="py-3">
+              <button type="submit" class="btn btn-success">保存</button>
+              <button type="reset" class="btn btn-success">重置</button>
+            </td>
           </tr>
         </table>
       </td>

src/admin/templets/diy_list.htm

@@ -45,10 +45,10 @@
 			?>
 			{/dede:datalist}
 			<tr>
-				<td colspan="3" bgcolor="#fff">{dede:pagelist listsize='6'/}</td>
+				<td colspan="3" height="26" bgcolor="#fff">{dede:pagelist listsize='6'/}</td>
 			</tr>
 			<tr>
-				<td colspan="3" height="36" bgcolor="#f8f8f8">
+				<td bgcolor="#f8f8f8" colspan="3" class="py-3">
 					<input type="button" name="select" onClick="selAll()" class="btn btn-success btn-sm" value="全选">
 					<input type="button" name="select" onClick="noSelAll()" class="btn btn-success btn-sm" value="取消">&nbsp;
 					<label><input type="radio" name="action" value="check">&nbsp;审核</label>

src/admin/templets/diy_post.htm

@@ -29,7 +29,7 @@ function SelectTemplets(fname){
 </table>
 <table width="98%" border="0" align="center" cellpadding="3" cellspacing="1">
 <tr>
-<td bgcolor="#f8f8f8" height="36" align="center">
+<td bgcolor="#f8f8f8" align="center" class="py-3">
 <input type="submit" name="submit" value="提交" class='np coolbg' />&nbsp;
 <input type="reset" name="reset" value="重置" class='np coolbg' />
 </td>

src/admin/templets/erradd.htm

@@ -89,7 +89,7 @@
 					<a href="javascript:delArc(0)" class="btn btn-success btn-sm">删除</a>
 				</td>
 			</tr>
-			<tr align="center" bgcolor="#f8f8f8" height="26">
+			<tr align="center" bgcolor="#f8f8f8" height="36">
 				<td colspan="8">{dede:pagelist listsize='6'/}</td>
 			</tr>
 		</table>

src/admin/templets/feedback_edit.htm

@@ -61,8 +61,8 @@
                 <textarea name="adminmsg" cols="60" rows="5" id="adminmsg"></textarea></td>
             </tr>
             <tr bgcolor="#ffffff">
-              <td height="36" width='600' colspan="2" align="center">
-                <button type="submit" class="btn btn-success">保存修改</button>
+              <td colspan="2" align="center" class="py-3">
+                <button type="submit" class="btn btn-success">保存保存</button>
                 <button onClick="location='<?php echo $ENV_GOBACK_URL; ?>';" type="button" class="btn btn-success">不理返回</button>
               </td>
             </tr>

src/admin/templets/feedback_main.htm

@@ -73,7 +73,7 @@
 				<div style="float:right;padding-right:10px">
 					<form name='form1'>
 						关键词：
-						<input type='text' size='15' name='keyword' style='width:150px'>
+						<input type='text' size='15' name='keyword' style='width:160px'>
 						<select name="typeid" style="width:180px">
 							<option value="0">请选择</option>
 							{dede:global.openarray /}
@@ -85,7 +85,7 @@
 		</tr>
 		<form name='feedback'>
 			<tr>
-				<td bgcolor="#ffffff" valign="top">
+				<td bgcolor="#ffffff">
 					<table width='100%' border='0' cellpadding='0' cellspacing='0' class="table table-borderless">
 						{dede:datalist empty='<tr height="26"><td><center>暂无内容</center></td></tr>'}
 						<tr height='26'>
@@ -123,7 +123,7 @@
 						</tr>
 						{/dede:datalist}
 						<tr>
-							<td height='26' align='center' bgcolor="#f8f8f8">{dede:pagelist listsize='6'/}</td>
+							<td height='36' align='center' bgcolor="#f8f8f8">{dede:pagelist listsize='6'/}</td>
 						</tr>
 						<tr>
 							<td height='30'>

src/admin/templets/file_edit.htm

@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-	<title>文件管理器</title>
+	<title>修改新建文件</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="stylesheet" href="../static/web/css/admin.css">
@@ -34,7 +34,7 @@
 		<input type="hidden" name="_csrf_token" value="{dede:global name='csrf_token'/}">
 		<table width='100%' border='0' align="center" cellpadding='3' cellspacing='1' class="table maintable mt-3">
 			<tr bgcolor='#EEF4EA'>
-				<td colspan="2" height="26" background="../static/web/img/wbg.gif" style="padding-left:10px">修改/新建文件</td>
+				<td colspan="2" height="26" background="../static/web/img/wbg.gif" style="padding-left:10px">修改新建文件</td>
 			</tr>
 			<tr bgcolor='#ffffff'>
 				<td>工作目录</td>
@@ -51,7 +51,7 @@
 				<td colspan='2'>{dede:global name='contentView'/}</td>
 			</tr>
 			<tr>
-				<td colspan='2' height="36" bgcolor='#f8f8f8' align='center'>
+				<td bgcolor="#f8f8f8" colspan="2" class="py-3">
 					<button type=submit name='B1' class="btn btn-success">保存</button>
 					<button type=reset name='B2' class="btn btn-success">重置</button>
 					<button type=button name='B4' class="btn btn-success" onClick="javascript:history.go(-1);">返回</button>

src/admin/templets/file_upload.htm

@@ -29,14 +29,12 @@
           <input type='hidden' name='fmdo' value="upload">
           <table border="0" cellpadding="0" cellspacing="0" width="100%" class="mt-3" style="border-collapse:collapse">
           <tr>
-            <td width="160"></td>
             <td style="padding-bottom:1rem">
               <input type="button" class="btn btn-success btn-sm" value="增加上传框" name="bbb" class="bt1" onClick="make_upload();">
               <a class="btn btn-success btn-sm" href="file_manage_main.php?activepath={dede:global name='activepath'/}">返回目录{dede:global name='activepath'/}</a>
             </td>
           </tr>
           <tr>
-            <td width="160"></td>
             <td>
               <div id="upfield">
                 <p>文件1：<input type='file' name='upfile1' style='width:380px'></p>
@@ -44,7 +42,6 @@
             </td>
           </tr>
           <tr>
-            <td width="160"></td>
             <td height="36">
               <input type="submit" class="btn btn-success btn-sm" value="上传文件" name="B1">
               <input type="button" class="btn btn-success btn-sm" value="重设表单" name="B12" onClick="reset_upload();">

src/admin/templets/freelist_add.htm

@@ -80,7 +80,7 @@
       <form action="freelist_add.php" method="post" name="form1" onSubmit="return CheckSubmit();">
         <input type="hidden" name="dopost" value="save">
         <tr>
-          <td height="265" valign="top" bgcolor="#ffffff">
+          <td height="265" bgcolor="#ffffff">
             <table width="99%" border="0" align="center" cellpadding="0" cellspacing="1" class="table-borderless">
               <tr>
                 <td height="56">
@@ -232,7 +232,7 @@
               </tr>
               <tr>
                 <td height="26" align="left">排列顺序：
-                  <select name="orderby" id="orderby" style="width:120">
+                  <select name="orderby" id="orderby" style="width:160px">
                     <option value="sortrank">置顶权限值</option>
                     <option value="pubdate" selected>发布时间</option>
                     <option value="senddate">录入时间</option>
@@ -241,19 +241,18 @@
                     <option value="lastpost">最后评论时间</option>
                     <option value="postnum">评论总数</option>
                   </select>
-                  　
                   <label><input name="order" type="radio" value="desc" checked>
                   由高到低</label>
                   <label><input type="radio" name="order" value="asc">
-                  由低到高</label></td>
+                  由低到高</label>
+                </td>
               </tr>
               <tr>
                 <td height="26" align="left">循环内的单行记录样式(InnerText)：[<a href='javascript:ShowHide("innervar");'><img src="../static/web/img/help.gif" border="0">底层变量field参考</a>]</td>
               </tr>
               <tr>
-                <td height="99" align="left"> <textarea name="innertext" cols="80" rows="6" id="myinnertext" style="width:80%;height:120px"></textarea>
-                  <script
-                    language="javascript">document.form1.innertext.value = document.getElementById("list4").innerHTML.toLowerCase();</script>
+                <td height="99" align="left"><textarea name="innertext" cols="80" rows="6" id="myinnertext" style="width:80%;height:120px"></textarea>
+                  <script language="javascript">document.form1.innertext.value = document.getElementById("list4").innerHTML.toLowerCase();</script>
                 </td>
               </tr>
               <tr>
@@ -262,17 +261,14 @@
                 </td>
               </tr>
               <tr>
-                <td height="50" align="left"> &nbsp; 
-                  <button name="Submit2" type="submit" id="Submit2" class="btn btn-success">保存一个列表</button>
+                <td align="center" class="py-3">
+                  <button name="Submit2" type="submit" id="Submit2" class="btn btn-success">保存</button>
                 </td>
               </tr>
             </table>
           </td>
         </tr>
       </form>
-      <tr>
-        <td valign="top" bgcolor="#f8f8f8"></td>
-      </tr>
     </table>
   </center>
   <script type="text/javascript">

src/admin/templets/freelist_edit.htm

@@ -64,14 +64,13 @@
           </td>
         </tr>
         <tr>
-          <td height="265" valign="top" bgcolor="#ffffff">
+          <td height="265" bgcolor="#ffffff">
             <table width="99%" border="0" align="right" cellpadding="0" cellspacing="1" class="table-borderless">
               <tr>
                 <td height="56">
                   <table width="100%" border="0" cellspacing="1" cellpadding="0">
                     <tr>
-                      <td height="26" colspan="2" align="left"><img src="../static/web/img/help.gif">自由列表标记的说明：自由列表标记(freelist)的功能基本等同于arclist标记，区别是freelist标记支持分页，这让生成Google
-                        Map、生成按自定义排序规则的文章列表（如按标题拼音部首排序等）等轻松的实现统一化管理，并且自由列是独立编译的，不与其它模板混在一起，这样不会影响系统生成HTML或访问速度</td>
+                      <td height="26" colspan="2" align="left"><img src="../static/web/img/help.gif">自由列表标记的说明：自由列表标记(freelist)的功能基本等同于arclist标记，区别是freelist标记支持分页，这让生成Google Map、生成按自定义排序规则的文章列表（如按标题拼音部首排序等）等轻松的实现统一化管理，并且自由列是独立编译的，不与其它模板混在一起，这样不会影响系统生成HTML或访问速度</td>
                     </tr>
                     <tr>
                       <td width="16%" height="26" align="left">自由列表标题：</td>
@@ -79,14 +78,12 @@
                     </tr>
                     <tr>
                       <td height="26" align="left">列表HTML存放目录：</td>
-                      <td align="left"><input name="listdir" type="text" id="listdir" style="width:35%" value="<?php echo $row['listdir']?>">
-                        {listdir}变量的值</td>
+                      <td align="left"><input name="listdir" type="text" id="listdir" style="width:35%" value="<?php echo $row['listdir']?>"> {listdir}变量的值</td>
                     </tr>
                     <tr>
                       <td height="26" align="left">目录默认页名称：</td>
                       <td align="left"><input name="defaultpage" type="text" id="defaultpage" style="width:35%" value="<?php echo $row['defaultpage']?>">
-                        <label><input name="nodefault" type="checkbox" id="nodefault" value="1"
-                          <?php if($row['nodefault']==1) echo " checked"; ?>>
+                        <label><input name="nodefault" type="checkbox" id="nodefault" value="1" <?php if($row['nodefault']==1) echo " checked"; ?>>
                         不使用目录默认主页</label>
                       </td>
                     </tr>
@@ -96,8 +93,10 @@
                     </tr>
                     <tr>
                       <td height="36" align="left">列表模板：</td>
-                      <td align="left"><input name="templet" type="text" id="templet" style="width:300px" value="<?php echo $row['templet']?>">
-                        <button type="button" name="set4" style="width:60px" onClick="SelectTemplets('form1.templet');" class="btn btn-success btn-sm">浏览</button></td>
+                      <td align="left">
+                        <input name="templet" type="text" id="templet" style="width:300px" value="<?php echo $row['templet']?>">
+                        <button type="button" name="set4" style="width:60px" onClick="SelectTemplets('form1.templet');" class="btn btn-success btn-sm">浏览</button>
+                      </td>
                     </tr>
                     <tr>
                       <td height="30" align="left">最大列出页数：</td>
@@ -173,9 +172,7 @@
                 	if($att==$nrow->att)
                 	{
                 		echo "<option value='{$nrow->att}' selected>{$nrow->attname}</option>\r\n";
-                	}
-                	else
-                	{
+                	} else {
                 		echo "<option value='{$nrow->att}'>{$nrow->attname}</option>\r\n";
                 	}
                 }
@@ -187,14 +184,11 @@
               </tr>
               <tr>
                 <td height="26" align="left">每页记录数：
-                  <input name="pagesize" type="text" id="pagesize" value="<?php echo $ctag->GetAtt('pagesize')?>"
-                    size="4">
+                  <input name="pagesize" type="text" id="pagesize" value="<?php echo $ctag->GetAtt('pagesize')?>" size="4">
                   　显示列数：
-                  <input name="col" type="text" id="col" value="<?php  $col = $ctag->GetAtt('col'); $v = ( empty($col) ? '1' :  $col ); echo $v; ?>"
-                    size="4">
+                  <input name="col" type="text" id="col" value="<?php  $col = $ctag->GetAtt('col'); $v = ( empty($col) ? '1' :  $col ); echo $v; ?>" size="4">
                   标题长度：
-                  <input name="titlelen" type="text" id="titlelen" value="<?php echo $ctag->GetAtt('titlelen')?>"
-                    size="4">
+                  <input name="titlelen" type="text" id="titlelen" value="<?php echo $ctag->GetAtt('titlelen')?>" size="4">
                   （1 字节 = 0.5个中文字）</td>
               </tr>
               <tr>
@@ -204,14 +198,11 @@
               	if($setype=='') $setype = 'X';
               	?>
                   高级筛选：
-                  <label><input name="types[]" type="checkbox" id="type1" value="image"
-                    <?php if(preg_match("#image#i",$setype)) echo ' checked'; ?>>
+                  <label><input name="types[]" type="checkbox" id="type1" value="image" <?php if(preg_match("#image#i",$setype)) echo ' checked'; ?>>
                   带缩略图</label>
-                  <label><input name="types[]" type="checkbox" id="type2" value="commend"
-                    <?php if(preg_match("#commend#i", $setype)) echo ' checked'; ?>>
+                  <label><input name="types[]" type="checkbox" id="type2" value="commend" <?php if(preg_match("#commend#i", $setype)) echo ' checked'; ?>>
                   推荐</label>
-                  <label><input name="types[]" type="checkbox" id="type3" value="spec" class="inputbut"
-                    <?php if(preg_match("#spec#i", $setype)) echo ' checked'; ?>>
+                  <label><input name="types[]" type="checkbox" id="type3" value="spec" class="inputbut" <?php if(preg_match("#spec#i", $setype)) echo ' checked'; ?>>
                   专题</label>　关键词：
                   <input name="keywordarc" type="text" id="keywordarc" value="<?php echo $ctag->GetAtt('keyword')?>">
                   （&quot;,&quot;逗号分开）
@@ -230,7 +221,7 @@
                 	$sortarrs[$vs[0]] = $vs[1];
                 }
                 ?>
-                  <select name="orderby" id="orderby" style="width:120">
+                  <select name="orderby" id="orderby" style="width:160px">
                     <?php
                 	echo "<option value=\"$orderby\" selected>{$sortarrs[$orderby]}</option>\r\n";
                 	?>
@@ -242,17 +233,14 @@
                     <option value="lastpost">最后评论时间</option>
                     <option value="postnum">评论总数</option>
                   </select>
-                  　
-                  <label><input name="order" type="radio" value="desc"
-                    <?php if($ctag->GetAtt('orderway')=='desc') echo " checked"; ?>>
+                  <label><input name="order" type="radio" value="desc" <?php if($ctag->GetAtt('orderway')=='desc') echo " checked"; ?>>
                   由高到低</label>
-                  <label><input type="radio" name="order" value="asc"
-                    <?php if($ctag->GetAtt('orderway')=='asc') echo " checked"; ?>>
-                  由低到高</label></td>
+                  <label><input type="radio" name="order" value="asc" <?php if($ctag->GetAtt('orderway')=='asc') echo " checked"; ?>>
+                  由低到高</label>
+                </td>
               </tr>
               <tr>
-                <td height="26" align="left">循环内的单行记录样式(InnerText)：[<img src="../static/web/img/help.gif"><a
-                    href='javascript:ShowHide("innervar");'>底层变量field参考</a>]</td>
+                <td height="26" align="left">循环内的单行记录样式(InnerText)：[<img src="../static/web/img/help.gif"><a href='javascript:ShowHide("innervar");'>底层变量field参考</a>]</td>
               </tr>
               <tr>
                 <td height="80" align="left">
@@ -265,17 +253,14 @@
                 </td>
               </tr>
               <tr>
-                <td height="50" align="left"> &nbsp;
-                  <button name="Submit2" type="submit" id="Submit2" class="btn btn-success">保存一个列表</button>
+                <td align="center" class="py-3">
+                  <button name="Submit2" type="submit" id="Submit2" class="btn btn-success">保存</button>
                 </td>
               </tr>
             </table>
           </td>
         </tr>
       </form>
-      <tr>
-        <td valign="top" bgcolor="#f8f8f8"></td>
-      </tr>
     </table>
   </center>
   <script type="text/javascript">

src/admin/templets/friendlink_add.htm

@@ -34,7 +34,7 @@ function CheckSubmit()
     <td height="26" background="../static/web/img/tbg.gif" style="padding-left:10px"><a href="friendlink_main.php">友情链接管理</a> &gt; 增加链接</td>
 </tr>
 <tr>
-    <td height="200" bgcolor="#ffffff" valign="top">
+    <td height="200" bgcolor="#ffffff">
 	<form action="friendlink_add.php" method="post" enctype="multipart/form-data" name="form1" onSubmit="return CheckSubmit();";>
 	<input type="hidden" name="dopost" value="add">
 	<table width="80%"  border="0" cellspacing="1" cellpadding="3" class="table table-borderless">

src/admin/templets/friendlink_edit.htm

@@ -14,7 +14,7 @@
         <a href="friendlink_main.php">友情链接管理</a> &gt; 链接修改</td>
     </tr>
     <tr>
-      <td height="200" bgcolor="#ffffff" valign="top">
+      <td height="200" bgcolor="#ffffff">
         <form action="friendlink_edit.php" method="post" enctype="multipart/form-data" name="form1">
           <input type="hidden" name="id" value="<?php echo $myLink['id']?>">
           <input type="hidden" name="dopost" value="saveedit">

src/admin/templets/friendlink_main.htm

@@ -110,7 +110,7 @@
         <a href='javascript:;' onclick='checkSubmit()' class="btn btn-success btn-sm">批量删除</a>
       </td>
     </tr>
-    <tr align="center" bgcolor="#f8f8f8" height="26">
+    <tr align="center" bgcolor="#f8f8f8" height="36">
       <td colspan="8">{dede:pagelist listsize='6'/}</td>
     </tr>
   </table>

src/admin/templets/friendlink_type.htm

@@ -19,8 +19,8 @@
           <a href='../apps/flink_add.php' target='_blank' class="btn btn-success btn-sm">外部申请表单</a></td>
       </tr>
       <tr bgcolor="#FBFCE2">
-        <td width="4%" height="26" align="center" valign="top">类型ID</td>
-        <td width="60%" align="center" valign="top">网站名称</td>
+        <td width="4%" height="26" align="center">类型ID</td>
+        <td width="60%" align="center">网站名称</td>
         <td width="36%" align="center">状态</td>
       </tr>
       <?php
@@ -33,10 +33,10 @@
 	?>
       <input type="hidden" name="ID_<?php echo $k?>" value="<?php echo $row->id?>">
       <tr align="center" bgcolor="#ffffff">
-        <td height="26" valign="top"><?php echo $row->id; ?>
+        <td height="26"><?php echo $row->id; ?>
         </td>
 
-        <td height="26" valign="top"><input name="pname_<?php echo $k?>" value="<?php echo $row->typename?>" type="text" id="pname_<?php echo $k?>" class='pubinputs' style="width:90%"></td>
+        <td height="26"><input name="pname_<?php echo $k?>" value="<?php echo $row->typename?>" type="text" id="pname_<?php echo $k?>" class='pubinputs' style="width:90%"></td>
         <td>
           <label><input name="check_<?php echo $k?>" type="checkbox" id="check_<?php echo $k?>" value="1" checked='1'
             class='np' />
@@ -47,10 +47,10 @@
 	?>
       <input type="hidden" name="idend" value="<?php echo $k?>">
       <tr bgcolor="#F8FCF1">
-        <td height="26" colspan="5" valign="top" bgcolor="#f8f8f8">新增一个网站类型：</td>
+        <td height="26" colspan="5" bgcolor="#f8f8f8">新增一个网站类型：</td>
       </tr>
       <tr height="26" align="center" bgcolor="#ffffff">
-        <td colspan="2" valign="top">
+        <td colspan="2">
           <input name="pname_new" type="text" id="pname_new" class='pubinputs' style="width:90%"></td>
 
         <td align="center" bgcolor="#ffffff">

src/admin/templets/index_menu.htm

@@ -30,7 +30,7 @@ a.mmac div{padding:6px 4px 4px 10px;height:40px;color:#4f7632;background:url(../
 <body target="main" onLoad="CheckOpenMenu();">
 	<table width="180" align="left" cellspacing="0" cellpadding="0">
 		<tr>
-			<td valign="top" style="padding-top:10px" width="26">
+			<td width="26" valign="top" style="padding-top:10px">
 				<a id="link1" class="mmac"><div onClick="ShowMainMenu(1)"><b>运维<b></div></a>
 				<a id="link100" class="mm"><div onClick="ShowMainMenu(100)"><b>插件<b></div></a>
 				<a id="link5" class="mm"><div onClick="ShowMainMenu(5)"><b>更新<b></div></a>
@@ -44,7 +44,7 @@ a.mmac div{padding:6px 4px 4px 10px;height:40px;color:#4f7632;background:url(../
 				}
 				?>
 			</td>
-			<td width="160" id="mainct" valign="top">
+			<td width="160" valign="top" id="mainct">
 				<div id="ct1">
 				<?php
 				GetMenus($cuserLogin->getUserRank(),'main');
@@ -61,7 +61,7 @@ a.mmac div{padding:6px 4px 4px 10px;height:40px;color:#4f7632;background:url(../
 		</tr>
 		<tr>
 			<td width="26"></td>
-			<td width="160" valign="top"><img src="../static/web/img/idnbgfoot.gif"></td>
+			<td width="160"><img src="../static/web/img/idnbgfoot.gif"></td>
 		</tr>
 	</table>
 	<?php

src/admin/templets/log_list.htm

@@ -125,7 +125,7 @@
       </td>
     </tr>
     <tr bgcolor="#f8f8f8">
-      <td height="26" colspan="7" align="center">{dede:pagelist listsize='6'/}</td>
+      <td height="36" colspan="7" align="center">{dede:pagelist listsize='6'/}</td>
     </tr>
   </table>
 </body>

src/admin/templets/makehtml_all.htm

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="<?php echo $cfg_soft_lang; ?>">
-<title>一键更新</title>
+<title>更新整站</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="stylesheet" rel="stylesheet" href="../static/web/css/admin.css">
@@ -62,11 +62,11 @@ function SelUp(){
         <form name="form1" action="makehtml_all.php" target="stafrm" method="post">
             <input type="hidden" name="action" value="make">
             <tr>
-                <td height="30" colspan="2" background="../static/web/img/tbg.gif" style="padding-left:10px">一键更新网站</td>
+                <td height="30" colspan="2" background="../static/web/img/tbg.gif" style="padding-left:10px">更新整站</td>
             </tr>
             <tr>
                 <td width="30%" height="30" bgcolor="#ffffff">更新选项：</td>
-                <td valign="top" bgcolor="#ffffff">
+                <td bgcolor="#ffffff">
                   <label><input name="uptype" id="uptype1" type="radio" value="time" onClick="SelUp()" checked="checked">&nbsp;指定时间的所有更新</label>
                   <label><input name="uptype" id="uptype2" type="radio" onClick="SelUp()" value="id">&nbsp;指定ID文档的所有更新</label>
                   <label><input name="uptype" id="uptype3" type="radio" onClick="SelUp()" value="mkall">&nbsp;更新所有</label>

src/admin/templets/makehtml_archives.htm

@@ -26,8 +26,8 @@
         </td>
       </tr>
       <tr>
-        <td width="108" valign="top" bgcolor="#ffffff">选择栏目：</td>
-        <td width="380" valign="top" bgcolor="#ffffff">
+        <td width="108" bgcolor="#ffffff">选择栏目：</td>
+        <td width="380" bgcolor="#ffffff">
         <?php
         if(empty($cid)) $cid="0";
         $tl = new TypeLink($cid);
@@ -40,12 +40,12 @@
         </td>
       </tr>
       <tr>
-        <td height="26" valign="top" bgcolor="#ffffff">起始ID：</td>
-        <td height="26" valign="top" bgcolor="#ffffff"><input name="startid" type="text" id="startid" style="width:60px">（空或0表示从头开始）</td>
+        <td height="26" bgcolor="#ffffff">起始ID：</td>
+        <td height="26" bgcolor="#ffffff"><input name="startid" type="text" id="startid" style="width:60px">（空或0表示从头开始）</td>
       </tr>
       <tr>
-        <td height="26" valign="top" bgcolor="#ffffff">结束ID：</td>
-        <td height="26" valign="top" bgcolor="#ffffff"><input name="endid" type="text" id="endid" style="width:60px">（空或0表示直到结束ID）</td>
+        <td height="26" bgcolor="#ffffff">结束ID：</td>
+        <td height="26" bgcolor="#ffffff"><input name="endid" type="text" id="endid" style="width:60px">（空或0表示直到结束ID）</td>
       </tr>
       <tr>
         <td height="26" bgcolor="#ffffff">每页生成：</td>

src/admin/templets/makehtml_freelist.htm

@@ -23,13 +23,13 @@
       </tr>
       <tr>
         <td width="108" height="26" bgcolor="#ffffff">&nbsp;&nbsp;起始ID：</td>
-        <td width="380" height="26" valign="top" bgcolor="#ffffff"><input name="startid" type="text" id="startid" size="10" <?php if(!empty($aid)) echo " value='$aid'"; ?>>
+        <td width="380" height="26" bgcolor="#ffffff"><input name="startid" type="text" id="startid" size="10" <?php if(!empty($aid)) echo " value='$aid'"; ?>>
           （空或0表示从头开始）
         </td>
       </tr>
       <tr>
-        <td height="26" valign="top" bgcolor="#ffffff">&nbsp;&nbsp;结束ID：</td>
-        <td height="26" valign="top" bgcolor="#ffffff">
+        <td height="26" bgcolor="#ffffff">&nbsp;&nbsp;结束ID：</td>
+        <td height="26" bgcolor="#ffffff">
           &nbsp;&nbsp;
           <input name="endid" type="text" id="endid" size="10" <?php if(!empty($aid)) echo " value='$aid'"; ?>>
           （空或0表示直到结束ID）
@@ -41,8 +41,8 @@
       </tr>
       <tr>
         <td height="36" colspan="2" bgcolor="#ffffff" align="center">
-            <button type="button" onClick="document.form1.submit();"  class="btn btn-success">开始更新</button>
-          &nbsp; </td>
+          <button type="button" onClick="document.form1.submit();"  class="btn btn-success">开始更新</button>
+        </td>
       </tr>
     </form>
     <tr>
@@ -57,7 +57,8 @@
                   else if (document.all[obj].style.pixelHeight > 80) document.all[obj].style.pixelHeight = document.all[obj].style.pixelHeight - 50;
                 }
               </script>
-              [<a href='javascript:;' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='javascript:;' onClick="ResizeDiv('mdv','-');">缩小</a>]
+              <a href="javascript:;" onClick="ResizeDiv('mdv','+');" class="btn btn-success btn-sm">增大</a>
+              <a href="javascript:;" onClick="ResizeDiv('mdv','-');" class="btn btn-success btn-sm">缩小</a>
             </td>
           </tr>
         </table>

src/admin/templets/makehtml_homepage.htm

@@ -34,23 +34,23 @@
         </td>
       </tr>
       <tr>
-        <td width="180" valign="top" bgcolor="#ffffff">选择首页模板：</td>
-        <td width="800" valign="top" bgcolor="#ffffff">
+        <td width="180" bgcolor="#ffffff">选择首页模板：</td>
+        <td width="800" bgcolor="#ffffff">
           <input name="templet" type="text" id="templet" value="<?php echo $row['templet']?>" style="width:260px">
           <button class="btn btn-success btn-sm" type="button" name="set4" value="" onClick="SelectTemplets('form1.templet');">浏览</button>
         </td>
       </tr>
       <tr>
-        <td height="26" colspan="2" valign="top" bgcolor="#ffffff">默认的情况下，生成的首页文件放在CMS的安装目录，如果您的CMS不是安装在网站根目录的，又想把首页创建到网站根目录，那么请用相对路径来表示“首页位置”<br>
+        <td height="26" colspan="2" bgcolor="#ffffff">默认的情况下，生成的首页文件放在CMS的安装目录，如果您的CMS不是安装在网站根目录的，又想把首页创建到网站根目录，那么请用相对路径来表示“首页位置”<br>
         例：您的CMS安装在 http://www.abc.com/DedeBIZ/ 目录，您想生成的首页为 http://www.abc.com/index.html，那吗首页位置就应该用：“../index.html”</td>
       </tr>
       <tr>
-        <td height="26" valign="top" bgcolor="#ffffff">首页位置：</td>
-        <td height="26" valign="top" bgcolor="#ffffff"><input name="position" type="text" id="position" value="<?php echo $row['position']?>" style="width:260px"></td>
+        <td height="26" bgcolor="#ffffff">首页位置：</td>
+        <td height="26" bgcolor="#ffffff"><input name="position" type="text" id="position" value="<?php echo $row['position']?>" style="width:260px"></td>
       </tr>
       <tr>
-        <td height="26" valign="top" bgcolor="#ffffff">相关选项：</td>
-        <td height="26" valign="top" bgcolor="#ffffff">
+        <td height="26" bgcolor="#ffffff">相关选项：</td>
+        <td height="26" bgcolor="#ffffff">
           <label><input name="saveset" type="radio" value="0" class="np">
             不保存当前选项</label>
           <label><input name="saveset" type="radio" class="np" value="1" checked>
@@ -58,8 +58,8 @@
         </td>
       </tr>
       <tr>
-        <td height="26" valign="top" bgcolor="#ffffff">首页模式:</td>
-        <td height="26" valign="top" bgcolor="#ffffff">
+        <td height="26" bgcolor="#ffffff">首页模式:</td>
+        <td height="26" bgcolor="#ffffff">
           <label><input name="showmod" type="radio" value="0" class="np" <?php echo ($row['showmod']==0)? "checked='checked'" : ""; ?>>
             动态浏览</label>
           <label><input name="showmod" type="radio" class="np" value="1" <?php echo ($row['showmod']==1)? "checked='checked'" : ""; ?>>
@@ -75,7 +75,7 @@
         if($data->code == -1){
       ?>
       <tr>
-        <td height="26" colspan="2" valign="top" bgcolor="#ffffff">尚未开启DedeBIZ商业组件 <a class="btn btn-danger btn-sm" target="_blank" href="https://www.dedebiz.com/start?code=-1008">如何启动组件</a></td>
+        <td height="26" colspan="2" bgcolor="#ffffff">尚未开启DedeBIZ商业组件 <a class="btn btn-danger btn-sm" target="_blank" href="https://www.dedebiz.com/start?code=-1008">如何启动组件</a></td>
       </tr>
       <?php
         } else {
@@ -84,23 +84,23 @@
           if($rs["admin_pwd_exists"] == "false") {
       ?>
       <tr>
-        <td height="26" valign="top" bgcolor="#ffffff">设置操作密码：</td>
-        <td height="26" valign="top" bgcolor="#ffffff"><input name="dedebiz_admin" type="password" id="dedebiz_admin" value="" style="width:260px">设定后所有的DedeBIZ涉及安全操作输入当前操作密码</td>
+        <td height="26" bgcolor="#ffffff">设置操作密码：</td>
+        <td height="26" bgcolor="#ffffff"><input name="dedebiz_admin" type="password" id="dedebiz_admin" value="" style="width:260px">设定后所有的DedeBIZ涉及安全操作输入当前操作密码</td>
       </tr>
       <tr>
-        <td height="26" valign="top" bgcolor="#ffffff">重复操作密码：</td>
-        <td height="26" valign="top" bgcolor="#ffffff"><input name="re_dedebiz_admin" type="password" id="re_dedebiz_admin" value="" style="width:260px"></td>
+        <td height="26" bgcolor="#ffffff">重复操作密码：</td>
+        <td height="26" bgcolor="#ffffff"><input name="re_dedebiz_admin" type="password" id="re_dedebiz_admin" value="" style="width:260px"></td>
       </tr>
       <?php
       } else {
       ?>
       <tr>
-        <td height="26" valign="top" bgcolor="#ffffff">操作密码：</td>
-        <td height="26" valign="top" bgcolor="#ffffff"><input name="dedebiz_admin" type="password" id="dedebiz_admin" value="" style="width:260px"></td>
+        <td height="26" bgcolor="#ffffff">操作密码：</td>
+        <td height="26" bgcolor="#ffffff"><input name="dedebiz_admin" type="password" id="dedebiz_admin" value="" style="width:260px"></td>
       </tr>
       <tr>
-        <td height="26" valign="top" bgcolor="#ffffff">首页状态：</td>
-        <td height="26" valign="top" bgcolor="#ffffff">
+        <td height="26" bgcolor="#ffffff">首页状态：</td>
+        <td height="26" bgcolor="#ffffff">
           <label><input name="lockindex" type="radio" class="np" value="unlock" <?php echo ($rs['index_lock_state']==true)? "checked='checked'" : ""; ?>>
             解锁</label>
           <label><input name="lockindex" type="radio" value="lock" class="np" <?php echo ($row['index_lock_state']==false)? "checked='checked'" : ""; ?>>
@@ -114,7 +114,7 @@
       } else {
       ?>
       <tr>
-        <td height="26" colspan="2" valign="top" bgcolor="#ffffff">尚未开启DedeBIZ商业组件 <a class="btn btn-danger btn-sm" target="_blank" href="https://www.dedebiz.com/start?code=-1008">如何启动组件</a>
+        <td height="26" colspan="2" bgcolor="#ffffff">尚未开启DedeBIZ商业组件 <a class="btn btn-danger btn-sm" target="_blank" href="https://www.dedebiz.com/start?code=-1008">如何启动组件</a>
         </td>
       </tr>
       <?php

src/admin/templets/makehtml_js.htm

@@ -29,8 +29,8 @@
         </td>
       </tr>
       <tr>
-        <td width="108" valign="top" bgcolor="#ffffff">选择栏目：</td>
-        <td width="380" valign="top" bgcolor="#ffffff">
+        <td width="108" bgcolor="#ffffff">选择栏目：</td>
+        <td width="380" bgcolor="#ffffff">
         <?php
         if(empty($cid)) $cid="0";
         $tl = new TypeLink($cid);
@@ -49,14 +49,14 @@
         </td>
       </tr>
       <tr>
-        <td height="26" valign="top" bgcolor="#ffffff">模板文件：</td>
-        <td height="26" valign="top" bgcolor="#ffffff"><input name="templet" type="text" id="templet" value="plus/js.htm" style="width:260px">
+        <td height="26" bgcolor="#ffffff">模板文件：</td>
+        <td height="26" bgcolor="#ffffff"><input name="templet" type="text" id="templet" value="plus/js.htm" style="width:260px">
           <button type="button" class="btn btn-success btn-sm" name="set4" onClick="SelectTemplets('form1.templet');">浏览</button>
         </td>
       </tr>
       <tr>
-        <td height="26" valign="top" bgcolor="#ffffff">更新选项：</td>
-        <td height="26" valign="top" bgcolor="#ffffff">
+        <td height="26" bgcolor="#ffffff">更新选项：</td>
+        <td height="26" bgcolor="#ffffff">
           <label><input type="radio" name="uptype" value="all" class="np">
           更新所有栏目</label>
           <label><input name="uptype" type="radio" value="onlyme" class="np" checked>

src/admin/templets/makehtml_list.htm

@@ -24,8 +24,8 @@
         </td>
       </tr>
       <tr>
-        <td width="108" valign="top" bgcolor="#ffffff">选择栏目：</td>
-        <td width="380" valign="top" bgcolor="#ffffff">
+        <td width="108" bgcolor="#ffffff">选择栏目：</td>
+        <td width="380" bgcolor="#ffffff">
         <?php
         if(empty($cid)) $cid=0;
         $tl = new TypeLink($cid);
@@ -38,12 +38,12 @@
         </td>
       </tr>
       <tr>
-        <td height="26" valign="top" bgcolor="#ffffff">每次最大创建页数：</td>
-        <td height="26" valign="top" bgcolor="#ffffff"><input name="maxpagesize" type="text" id="maxpagesize" value="50" style="width:60px"> 个文件</td>
+        <td height="26" bgcolor="#ffffff">每次最大创建页数：</td>
+        <td height="26" bgcolor="#ffffff"><input name="maxpagesize" type="text" id="maxpagesize" value="50" style="width:60px"> 个文件</td>
       </tr>
       <tr>
-        <td height="26" valign="top" bgcolor="#ffffff">是否更新子栏目：</td>
-        <td height="26" valign="top" bgcolor="#ffffff">
+        <td height="26" bgcolor="#ffffff">是否更新子栏目：</td>
+        <td height="26" bgcolor="#ffffff">
           <label><input name="upnext" type="radio" class="np" value="1" checked='1' />
           更新子级栏目</label>
           <label><input type="radio" name="upnext" class="np" value="0">

src/admin/templets/makehtml_spec.htm

@@ -22,7 +22,7 @@
         </td>
       </tr>
       <tr>
-        <td height="26" valign="top" bgcolor="#ffffff">为了安全起见，专题目录建议设置仅可读写权限，发布专题后需要手动更新，默认文件为：<?php echo $cfg_cmspath.$cfg_special."/index.html"?></td>
+        <td height="26" bgcolor="#ffffff">为了安全起见，专题目录建议设置仅可读写权限，发布专题后需要手动更新，默认文件为：<?php echo $cfg_cmspath.$cfg_special."/index.html"?></td>
       </tr>
       <tr>
         <td height="26" bgcolor="#ffffff" align="center"> 

src/admin/templets/makehtml_taglist.htm

@@ -14,7 +14,7 @@
         $('#tagid').select2({
           language: "zh-CN",
           allowClear: true,
-          placeholder:"请选择一个标签",
+          placeholder:"请输入一个标签",
           ajax: {
             url: 'makehtml_taglist.php?action=search',
             delay: 500,
@@ -55,8 +55,8 @@
         $row = $dsql->GetOne("Select tag From `#@__tagindex` where id = '$tagid' ");
       ?>
       <tr>
-        <td width="300" valign="top" bgcolor="#ffffff">输入标签：</td>
-        <td width="380" valign="top" bgcolor="#ffffff">
+        <td width="300" bgcolor="#ffffff">输入标签：</td>
+        <td width="380" bgcolor="#ffffff">
           <input type="hidden" name="tagid" value="<?php echo $tagid;?>"><?php echo $row['tag'];?> <a class="text-success" href="makehtml_taglist.php">重新选择</a>
         </td>
       </tr>
@@ -64,29 +64,28 @@
       } else {
       ?>
       <tr>
-        <td width="300" valign="top" bgcolor="#ffffff">输入标签：</td>
-        <td width="380" valign="top" bgcolor="#ffffff">
-          <select id='tagid' name='tagid' style='width:260px'></select>（请输入标签搜索）
+        <td width="300" bgcolor="#ffffff">输入标签：</td>
+        <td width="380" bgcolor="#ffffff">
+          <select id='tagid' name='tagid' style='width:260px'></select>
         </td>
       </tr>
       <?php
       }
       ?>
       <tr>
-        <td height="26" valign="top" bgcolor="#ffffff">生成位置：</td>
-        <td height="26" valign="top" bgcolor="#ffffff"><input name="tagsdir" type="text" id="tagsdir" value="<?php echo $cfg_tags_dir;?>" style="width:260px" disabled> <a href="sys_info.php" class="text-success">【系统设置】</a>-【其他选项】中“TAGS生成目录”项进行调整</td>
+        <td height="26" bgcolor="#ffffff">生成位置：</td>
+        <td height="26" bgcolor="#ffffff"><input name="tagsdir" type="text" id="tagsdir" value="<?php echo $cfg_tags_dir;?>" style="width:260px" disabled> <a href="sys_info.php">系统设置</a>-其他选项中“TAGS生成目录”项进行调整</td>
       </tr>
       <tr>
-        <td height="26" valign="top" bgcolor="#ffffff">每次最大创建页数：</td>
-        <td height="26" valign="top" bgcolor="#ffffff"><input name="maxpagesize" type="text" id="maxpagesize" value="50" style="width:60px"> 个文件</td>
+        <td height="26" bgcolor="#ffffff">每次最大创建页数：</td>
+        <td height="26" bgcolor="#ffffff"><input name="maxpagesize" type="text" id="maxpagesize" value="50" style="width:60px"> 个文件</td>
       </tr>
       <tr>
-        <td height="26" valign="top" bgcolor="#ffffff">说明：</td>
-        <td height="26" valign="top" bgcolor="#ffffff">
-          更新所有Tag将会智能更新在[Tag标签管理]中重新获取更新的内容<br>
+        <td height="26" bgcolor="#ffffff">标签说明：</td>
+        <td height="26" bgcolor="#ffffff">
+          生成静态文件后，访问动态文件则直接跳转到静态文件，如果需要动态访问，删除对应文件即可<br>
           Tag首页模板文件：<?php echo $cfg_templets_dir; ?>/<?php echo $cfg_df_style?>/tag.htm<br>
           Tag列表页模板文件：<?php echo $cfg_templets_dir; ?>/<?php echo $cfg_df_style?>/taglist.htm<br>
-          生成静态文件后，访问动态文件则直接跳转到静态文件，如果需要动态访问，删除对应文件即可
         </td>
       </tr>
       <tr>

src/admin/templets/makeremote_all.htm

@@ -43,13 +43,13 @@ function changeDopost(postval)
       </td>
     </tr>
     <tr>
-      <td width="61" valign="top" bgcolor="#ffffff">
+      <td width="61" bgcolor="#ffffff">
         <label><input type="checkbox" name="remoteiterm" id="remoteiterm"  onChange="javascript:checkAll()"></label>&nbsp;选择
       </td>
-      <td width="185" align="center" valign="top" bgcolor="#ffffff">项目（站点根目录）</td>
-      <td width="265" align="center" valign="top" bgcolor="#ffffff">项目说明</td>
-      <td width="195" align="center" valign="top" bgcolor="#ffffff">选择服务器</td>
-      <td width="196" align="center" valign="top" bgcolor="#ffffff">状态</td>
+      <td width="185" align="center" bgcolor="#ffffff">项目（站点根目录）</td>
+      <td width="265" align="center" bgcolor="#ffffff">项目说明</td>
+      <td width="195" align="center" bgcolor="#ffffff">选择服务器</td>
+      <td width="196" align="center" bgcolor="#ffffff">状态</td>
     </tr>
     <?php
     foreach($remotefile as $key => $value)
@@ -57,11 +57,11 @@ function changeDopost(postval)
     $bgcolor = ($key % 2 == 0)? '#E6F3CD' : '#ffffff';
     ?>
     <tr>
-      <td width="60" align="center" valign="top" bgcolor="<?php echo $bgcolor; ?>"><input name="Iterm[<?php echo $key; ?>]" type="checkbox" id="Iterm" value="<?php echo $value['filedir'] ; ?>"></td>
-      <td width="185" align="left" valign="top" bgcolor="<?php echo $bgcolor; ?>"><?php echo $value['filedir'] ; ?><?php echo ($value['issystem']==1)? '<span style='color:#dc3545'>[系统]</span>' : '' ; ?></td>
-      <td width="260" valign="top" bgcolor="<?php echo $bgcolor; ?>"><?php echo $value['description'] ; ?></td>
-      <td width="190" align="center" valign="top" bgcolor="<?php echo $bgcolor; ?>"><label></label></td>
-      <td width="190" align="center" valign="top" bgcolor="<?php echo $bgcolor; ?>"><?php echo GetState($value['state']) ; ?></td>
+      <td width="60" align="center" bgcolor="<?php echo $bgcolor; ?>"><input name="Iterm[<?php echo $key; ?>]" type="checkbox" id="Iterm" value="<?php echo $value['filedir'] ; ?>"></td>
+      <td width="185" align="left" bgcolor="<?php echo $bgcolor; ?>"><?php echo $value['filedir'] ; ?><?php echo ($value['issystem']==1)? '<span style='color:#dc3545'>[系统]</span>' : '' ; ?></td>
+      <td width="260" bgcolor="<?php echo $bgcolor; ?>"><?php echo $value['description'] ; ?></td>
+      <td width="190" align="center" bgcolor="<?php echo $bgcolor; ?>"><label></label></td>
+      <td width="190" align="center" bgcolor="<?php echo $bgcolor; ?>"><?php echo GetState($value['state']) ; ?></td>
     </tr>
     <?php
     }

src/admin/templets/media_add.htm

@@ -60,15 +60,14 @@
       <td height="26" bgcolor="#ffffff"><img src="../static/web/img/help.gif">提示：图片类型仅支持jpg、png、gif、wbmp格式，flash为.swf格式，视音频和附件为限定扩展名的类型（可在系统参数中修改）</td>
     </tr>
     <tr>
-      <td height="69" align="center" valign="top" bgcolor="#ffffff">
+      <td height="70" align="center" bgcolor="#ffffff">
         <table width="100%" border="0" cellpadding="0" cellspacing="0" class="table table-borderless">
-          <form enctype="multipart/form-data" name='form1' action="media_add.php" method="POST"
-            onSubmit="return CheckSubmit();">
+          <form enctype="multipart/form-data" name='form1' action="media_add.php" method="POST" onSubmit="return CheckSubmit();">
             <input type="hidden" name="dopost" value="upload">
             <input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token']; ?>">
             <tr>
-              <td width="15%" height="30" align="center" bgcolor="#ffffff" class='bline'>媒体类型：</td>
-              <td width="85%" height="26" bgcolor="#ffffff" class='bline' style="text-align:left">
+              <td width="160" height="26" bgcolor="#ffffff" class="bline">媒体类型：</td>
+              <td height="26" bgcolor="#ffffff" class="bline">
                 <label><input name="mediatype" type="radio" class="np" value="1" checked='1' />
                 图片 </label>
                 <label><input type="radio" name="mediatype" class="np" value="2">
@@ -80,51 +79,47 @@
               </td>
             </tr>
             <tr>
-              <td height="30" align="center" bgcolor="#ffffff" class='bline'>说明标题：</td>
-              <td height="26" bgcolor="#ffffff" class='bline' style="text-align:left">
+              <td height="26" bgcolor="#ffffff" class="bline">说明标题：</td>
+              <td height="26" bgcolor="#ffffff" class="bline">
                 <input name="title" type="text" id="title" size="30" style="width:300px">
               </td>
             </tr>
             <tr>
-              <td height="30" align="center" bgcolor="#ffffff" class='bline'>参数说明：</td>
-              <td height="30" bgcolor="#ffffff" class='bline' colspan='2' style="text-align:left">
-                图片不需要指定“宽”、“高”，其它附加参数仅方便多媒体文件管理，没其它含义
-              </td>
+              <td height="26" bgcolor="#ffffff" class="bline">参数说明：</td>
+              <td height="26" bgcolor="#ffffff" class="bline" colspan="2">图片不需要指定“宽”、“高”，其它附加参数仅方便多媒体文件管理，没其它含义</td>
             </tr>
             <tr>
-              <td height="30" align="center" bgcolor="#ffffff" class='bline'>附加参数：</td>
-              <td height="26" bgcolor="#ffffff" class='bline' style="text-align:left">
-                宽：<input name="mediawidth" type="text" id="mediawidth" size="5">（像素）
-                高：<input name="mediaheight" type="text" id="mediaheight" size="5">（像素）
-                播放时间：<input name="playtime" type="text" id="mediawidth3" size="5">（分钟）
+              <td height="26" bgcolor="#ffffff" class="bline">附加参数：</td>
+              <td height="26" bgcolor="#ffffff" class="bline">
+                宽：<input name="mediawidth" type="text" id="mediawidth" style="width:60px">（像素）
+                高：<input name="mediaheight" type="text" id="mediaheight" style="width:60px">（像素）
+                播放时间：<input name="playtime" type="text" id="mediawidth3" style="width:60px">（分钟）
               </td>
             </tr>
             <tr>
-              <td height="30" align="center" bgcolor="#ffffff" class='bline'>上传文件：</td>
-              <td bgcolor="#ffffff" class='bline' style="text-align:left">数量：
-                <input name="picnum" type="text" id="picnum" value="5" size="6">
-                <button type="button" name="Submit" class="btn btn-success btn-sm" onClick="MakeUpload()">增加</button>&nbsp;
+              <td height="26" bgcolor="#ffffff" class="bline">上传文件：</td>
+              <td bgcolor="#ffffff" class="bline">
+                数量：<input name="picnum" type="text" id="picnum" value="5" style="width:60px">
+                <button type="button" name="Submit" class="btn btn-success btn-sm" onClick="MakeUpload()">增加</button>
                 <button type="button" name="Submit" class="btn btn-success btn-sm" onClick="ResetUpload()">恢复</button>
               </td>
             </tr>
             <tr>
-              <td align="center" bgcolor="#ffffff"></td>
-              <td bgcolor="#ffffff" style="text-align:left">
-                <input name="upfile1" type="file" id="upfile1" style='width:260px' size='30' class='pubinputs' /><br>
-                <input name="upfile2" type="file" id="upfile2" style='width:260px' size='30' class='pubinputs' /><br>
-                <input name="upfile3" type="file" id="upfile3" style='width:260px' size='30' class='pubinputs' /><br>
-                <input name="upfile4" type="file" id="upfile4" style='width:260px' size='30' class='pubinputs' /><br>
-                <input name="upfile5" type="file" id="upfile5" style='width:260px' size='30' class='pubinputs' /><br>
+              <td bgcolor="#ffffff"></td>
+              <td bgcolor="#ffffff">
+                <input name="upfile1" type="file" id="upfile1" class='pubinputs' style='width:260px' /><br>
+                <input name="upfile2" type="file" id="upfile2" class='pubinputs' style='width:260px' /><br>
+                <input name="upfile3" type="file" id="upfile3" class='pubinputs' style='width:260px' /><br>
+                <input name="upfile4" type="file" id="upfile4" class='pubinputs' style='width:260px' /><br>
+                <input name="upfile5" type="file" id="upfile5" class='pubinputs' style='width:260px' /><br>
                 <span id='uploadfield'></span>
               </td>
             </tr>
             <tr>
-              <td height="50" colspan="2" bgcolor="#ffffff">
-                <table width="60%" border="0" cellspacing="0" cellpadding="0">
+              <td height="36" colspan="2" bgcolor="#ffffff">
+                <table width="100%" border="0" cellspacing="0" cellpadding="0">
                   <tr>
-                    <td align="center">
-                      <button type="submit" class="btn btn-success">保存</button>
-                    </td>
+                    <td align="center" class="py-3"><button type="submit" class="btn btn-success">保存</button></td>
                   </tr>
                 </table>
               </td>

src/admin/templets/media_edit.htm

@@ -45,7 +45,7 @@
 			</td>
 		</tr>
 		<tr>
-			<td height="69" align="center" valign="top" bgcolor="#ffffff">
+			<td height="70" align="center" bgcolor="#ffffff">
 				<table width="100%" border="0" cellpadding="0" cellspacing="0">
 					<form enctype="multipart/form-data" name='form1' action="media_edit.php" method="POST"
 						onSubmit="return CheckSubmit();">
@@ -53,8 +53,8 @@
 						<input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token']; ?>">
 						<input type="hidden" name="aid" value="<?php echo $aid?>">
 						<tr>
-							<td width="15%" height="30" align="left" bgcolor="#ffffff" class='bline'>媒体类型：</td>
-							<td width="85%" height="26" align="left" bgcolor="#ffffff" class='bline'>
+							<td width="15%" height="30" align="left" bgcolor="#ffffff" class="bline">媒体类型：</td>
+							<td width="85%" height="26" align="left" bgcolor="#ffffff" class="bline">
 								<label><input type="radio" name="mediatype" class="np" value="1" <?php if($myrow['mediatype']==1) echo " checked"; ?>>
 								图片</label>
 								<label><input type="radio" name="mediatype" class="np" value="2" <?php if($myrow['mediatype']==2) echo " checked"; ?>>
@@ -66,29 +66,28 @@
 							</td>
 						</tr>
 						<tr>
-							<td height="30" align="center" bgcolor="#ffffff" class='bline'>说明标题：</td>
-							<td height="26" align="left" bgcolor="#ffffff" class='bline'>
+							<td height="26" bgcolor="#ffffff" class="bline">说明标题：</td>
+							<td height="26" bgcolor="#ffffff" class="bline">
 								<input name="title" type="text" id="title" size="30" value="<?php echo $myrow['title']?>">
 							</td>
 						</tr>
 						<tr>
-							<td height="30" align="center" bgcolor="#ffffff" class='bline'>参数说明：</td>
-							<td height="30" colspan='2' align="left" bgcolor="#ffffff" class='bline'>
-								图片不需要指定“宽”、“高”，其它附加参数仅方便多媒体文件管理，没其它含义</td>
+							<td height="26" bgcolor="#ffffff" class="bline">参数说明：</td>
+							<td height="26" bgcolor="#ffffff" class="bline" colspan="2">图片不需要指定“宽”、“高”，其它附加参数仅方便多媒体文件管理，没其它含义</td>
 						</tr>
 						<tr>
-							<td height="30" align="center" bgcolor="#ffffff" class='bline'>附加参数：</td>
-							<td height="26" align="left" bgcolor="#ffffff" class='bline'>
+							<td height="26" bgcolor="#ffffff" class="bline">附加参数：</td>
+							<td height="26" bgcolor="#ffffff" class="bline">
 								宽：<input name="mediawidth" type="text" id="mediawidth" size="5" value="<?php echo $myrow['width']?>">（像素）
 								高：<input name="mediaheight" type="text" id="mediaheight" size="5" value="<?php echo $myrow['height']?>">（像素）
 								播放时间：<input name="playtime" type="text" id="playtime" size="5" value="<?php echo $myrow['playtime']?>">（分钟）
 							</td>
 						</tr>
 						<tr>
-							<td height="30" align="center" bgcolor="#ffffff" class='bline'>原文件：</td>
-							<td align="left" bgcolor="#ffffff" class='bline'>
-								<input name="filename" type="text" id="filename" style='width:350px' value="<?php echo $myrow['url']?>">
-								<a href='<?php echo $myrow['url']?>' target='_blank'>[查看]</a>
+							<td height="26" bgcolor="#ffffff" class="bline">原文件：</td>
+							<td height="26" bgcolor="#ffffff" class="bline">
+								<input name="filename" type="text" id="filename" style='width:260px' value="<?php echo $myrow['url']?>">
+								<a href="<?php echo $myrow['url']?>" target="_blank">[查看]</a>
 							</td>
 						</tr>
 						<?php
@@ -103,25 +102,23 @@
 									else $w = $sizes[0];
 						?>
 						<tr>
-							<td height="30" align="center" bgcolor="#ffffff" class='bline'>预览：</td>
-							<td align="left" bgcolor="#ffffff" class='bline'>
+							<td height="26" bgcolor="#ffffff" class="bline">预览：</td>
+							<td height="26" bgcolor="#ffffff" class="bline">
 								<a href="<?php echo $myrow['url']?>" target="_blank"><img src="<?php echo $myrow['url'].'?q='.time()?>" width="<?php echo $w?>" id="picview"></a>
 							</td>
 						</tr>
 						<?php } } } ?>
 						<tr>
-							<td height="26" align="center" bgcolor="#ffffff" class='bline'>修改文件：</td>
-							<td align="left" bgcolor="#ffffff" class='bline'>
-								<input name="upfile" type="file" id="upfile" style='width:260px' size='30'>
+							<td height="26" bgcolor="#ffffff" class="bline">修改文件：</td>
+							<td height="26" bgcolor="#ffffff" class="bline">
+								<input name="upfile" type="file" id="upfile" style='width:260px'>
 							</td>
 						</tr>
 						<tr>
-							<td height="62" colspan="2" bgcolor="#ffffff" class='bline'>
-								<table width="60%" border="0" cellspacing="0" cellpadding="0" class="table table-borderless">
+							<td height="36" colspan="2" bgcolor="#ffffff" class="bline">
+								<table width="100%" border="0" cellspacing="0" cellpadding="0" class="table table-borderless">
 									<tr>
-										<td align="center" height='48'>
-											<button type="submit" class="btn btn-success">保存</button>
-										</td>
+										<td align="center" class="py-3"><button type="submit" class="btn btn-success">保存</button></td>
 									</tr>
 								</table>
 							</td>

src/admin/templets/member_main.htm

@@ -124,7 +124,7 @@
       </tr>
       {/dede:datalist}
       <tr bgcolor="#ffffff">
-        <td height="36" colspan="9">
+        <td colspan="9" class="py-3">
           <button type="button" onClick="selAll();" class="btn btn-success btn-sm">全选</button>
           <button type="button" onClick="noSelAll();" class="btn btn-success btn-sm">取消</button>
           <button type="button" onClick="delArc(0);" class="btn btn-success btn-sm">删除</button>（如果已经整合了论坛的用户请不要使用批量删除功能）

src/admin/templets/member_pm.htm

@@ -68,7 +68,7 @@
     </tr>
     {/dede:datalist}
     <tr bgcolor="#f8f8f8">
-      <td height="26" colspan="9" align="center"> {dede:pagelist listsize='6'/}</td>
+      <td height="36" colspan="9" align="center"> {dede:pagelist listsize='6'/}</td>
     </tr>
   </table>
 </body>

src/admin/templets/member_pmall.htm

@@ -50,11 +50,11 @@
         <td width="87%" height="26"><input name="subject" type="text" id="subject" class="company_manage_form_label">标题少于70个字符内</td>
       </tr>
       <tr>
-        <td height="12" align="right" valign="top" style="padding-top:5px;"><label for="pm_textarea">内容：</label></td>
+        <td height="12" align="right" style="padding-top:5px;"><label for="pm_textarea">内容：</label></td>
         <td height="120" ><textarea name="message" id="message" cols="40" rows="5" class="company_manage_form_label1" style="width:360px;height:100px"></textarea>1000个字符以内</td>
       </tr>
       <tr>
-        <td height="26" align="right" valign="top"></td>
+        <td height="26" align="right"></td>
         <td height="30"><input type="submit" value="提交" class="button01"></td>
       </tr>
     </table>

src/admin/templets/member_pmone.htm

@@ -54,11 +54,11 @@
         <td width="87%" height="26"><input name="subject" type="text" id="subject" class="company_manage_form_label">标题少于70个字符内</td>
       </tr>
       <tr>
-        <td height="12" align="right" valign="top" style="padding-top:5px;"><label for="pm_textarea">内容：</label></td>
+        <td height="12" align="right" style="padding-top:5px;"><label for="pm_textarea">内容：</label></td>
         <td height="120"><textarea name="message" id="message" cols="40" rows="5" class="company_manage_form_label1" style="width:360px;height:100px"></textarea>1000个字符以内</td>
       </tr>
       <tr>
-        <td height="26" align="right" valign="top"></td>
+        <td height="26" align="right"></td>
         <td height="30"><input type="submit" value="提交" class="button01"></td>
       </tr>
     </table>

src/admin/templets/member_rank.htm

@@ -76,7 +76,7 @@
         <td height="26" colspan="6" bgcolor="#F8FCF1"></td>
       </tr>
       <tr>
-        <td height="36" colspan="6" align="center" bgcolor="#ffffff"><button type="submit" class="btn btn-success">保存</button></td>
+        <td bgcolor="#ffffff" colspan="6" align="center" class="py-3"><button type="submit" class="btn btn-success">保存</button></td>
       </tr>
     </table>
   </form>

src/admin/templets/member_scores.htm

@@ -34,24 +34,19 @@
           <input type="checkbox" name="chkall" id="chkall" onClick="CheckAll(this.form)" class='np' />
           删</td>
         <td width="23%" align="center" bgcolor="#FEFCEF">积分大于</td>
-        <td width="24%" align="center" bgcolor="#FEFCEF">星星数</td>
+        <td width="30%" align="center" bgcolor="#FEFCEF">星星数</td>
         <td width="23%" align="center" bgcolor="#FEFCEF">级别头衔</td>
-        <td width="24%" align="center" bgcolor="#FEFCEF">是否默认</td>
+        <td width="30%" align="center" bgcolor="#FEFCEF">是否默认</td>
       </tr>
       <?php
 		  foreach($Scores as $v){	
 		  ?>
       <tr bgcolor="#ffffff" onMouseMove="javascript:this.bgColor='#FCFDEE';" onMouseOut="javascript:this.bgColor='#ffffff';">
+        <td align="center"><input name="Ids-<?php echo $v['id']?>" type="checkbox" id="Ids-<?php echo $v['id']?>" value="1" class='np' /></td>
+        <td align="center"><input name="integral-<?php echo $v['id']?>" type="text" id="integral-<?php echo $v['id']?>" value="<?php echo $v['integral']?>" style="width:160px"></td>
+        <td align="center"><input name="icon-<?php echo $v['id']?>" type="text" id="icon-<?php echo $v['id']?>" value="<?php echo $v['icon']?>" style="width:60px"></td>
+        <td align="center"><input name="titles-<?php echo $v['id']?>" type="text" id="titles-<?php echo $v['id']?>" value="<?php echo $v['titles']?>" style="width:160px"></td>
         <td align="center">
-          <input name="Ids-<?php echo $v['id']?>" type="checkbox" id="Ids-<?php echo $v['id']?>" value="1" class='np' />
-        </td>
-        <td align="left">
-          <input name="integral-<?php echo $v['id']?>" type="text" id="integral-<?php echo $v['id']?>" value="<?php echo $v['integral']?>" size="10"></td>
-        <td align="left">
-          <input name="icon-<?php echo $v['id']?>" type="text" id="icon-<?php echo $v['id']?>" value="<?php echo $v['icon']?>" size="3"></td>
-        <td align="left">
-          <input name="titles-<?php echo $v['id']?>" type="text" id="titles-<?php echo $v['id']?>" value="<?php echo $v['titles']?>" size="20"></td>
-        <td align="left">
           <select name="isdefault-<?php echo $v['id']?>" id="isdefault-<?php echo $v['id']?>">
             <option value="1" <?php if($v['isdefault']) echo " selected='selected'"; ?>>是</option>
             <option value="0" <?php if(!$v['isdefault']) echo " selected='selected'"; ?>>否</option>
@@ -63,10 +58,10 @@
 		  ?>
       <tr bgcolor="#f8f8f8">
         <td>新增：</td>
-        <td><input name="add_integral" type="text" id="add_integral" size="10"></td>
-        <td><input name="add_icon" type="text" id="add_icon" size="3"></td>
-        <td><input name="add_titles" type="text" id="add_titles" size="20"></td>
-        <td>
+        <td align="center"><input name="add_integral" type="text" id="add_integral" style="width:160px"></td>
+        <td align="center"><input name="add_icon" type="text" id="add_icon" style="width:60px"></td>
+        <td align="center"><input name="add_titles" type="text" id="add_titles" style="width:160px"></td>
+        <td align="center">
           <select name="add_isdefault" id="add_isdefault">
             <option value="1">是</option>
             <option value="0">否</option>
@@ -74,7 +69,7 @@
         </td>
       </tr>
       <tr>
-        <td height="36" colspan="5" align="center">
+        <td colspan="5" align="center" class="py-3">
           <button type="submit" class="btn btn-success">提交</button>
         </td>
       </tr>

src/admin/templets/member_toadmin.htm

@@ -102,8 +102,7 @@
                 <input name="randcode" type="hidden" value="<?php echo $randcode; ?>">（复制本代码：<span style='color:#e74d58'><?php echo $safecode; ?></span>）</td>
             </tr>
             <tr>
-              <td height="36"></td>
-              <td height="36" height="26" class="bline">
+              <td colspan="2" class="py-3">
                 <button type="submit" name="Submit" class="btn btn-success btn-sm">确定提升</button>
                 <button type="reset" name="Submit22" class="btn btn-success btn-sm">重置表单</button>
                 <button type="button" onclick="javascript:history.go(-1);" class="btn btn-success btn-sm">不理返回</button>

src/admin/templets/member_type.htm

@@ -25,8 +25,8 @@
         </td>
       </tr>
       <tr bgcolor="#FBFCE2">
-        <td width="22%" height="26" align="center" valign="top">产品名称</td>
-        <td width="23%" align="center" valign="top">会员级别</td>
+        <td width="22%" height="26" align="center">产品名称</td>
+        <td width="23%" align="center">会员级别</td>
         <td width="21%" align="center">产品价格</td>
         <td width="18%" align="center">会员期限(天)</td>
         <td width="16%" align="center">状态</td>
@@ -41,10 +41,10 @@
 	?>
       <input type="hidden" name="ID_<?php echo $k?>" value="<?php echo $row->aid?>">
       <tr align="center" bgcolor="#ffffff">
-        <td height="26" valign="top">
+        <td height="26">
           <input name="pname_<?php echo $k?>" value="<?php echo $row->pname?>" type="text" id="pname_<?php echo $k?>" style="width:90%" class='pubinputs' />
         </td>
-        <td height="26" valign="top">
+        <td height="26">
           <select name='rank_<?php echo $k?>' id='rank_<?php echo $k?>' style='width:90%' />
           <?php
           foreach($arcranks as $kkk=>$vvv){
@@ -79,13 +79,13 @@
 	?>
       <input type="hidden" name="idend" value="<?php echo $k?>">
       <tr bgcolor="#f8f8f8">
-        <td height="26" colspan="5" valign="top">&nbsp;新增一个会员产品类型：</td>
+        <td height="26" colspan="5">&nbsp;新增一个会员产品类型：</td>
       </tr>
       <tr height="26" align="center" bgcolor="#ffffff">
-        <td valign="top">
+        <td>
           <input name="pname_new" type="text" id="pname_new" style="width:90%" class='pubinputs' />
         </td>
-        <td valign="top">
+        <td>
           <select name='rank_new' id='rank_new' style='width:90%'>
             <?php
           foreach($arcranks as $kkk=>$vvv){
@@ -94,11 +94,11 @@
 	   	?>
           </select>
         </td>
-        <td valign="top">
+        <td>
           <input name="money_new" type="text" id="money_new" style='width:80%' value="100" class='pubinputs' />
           （元）
         </td>
-        <td valign="top">
+        <td>
           <select name='exptime_new' id='exptime_new' style='width:90%'>
             <?php
           foreach($times as $kkk=>$vvv){
@@ -116,8 +116,8 @@
         <td height="26" colspan="5" bgcolor="#ffffff"></td>
       </tr>
       <tr>
-        <td height="30" colspan="5" align="center" bgcolor="#f8f8f8">
-          <button type="submit" class="btn btn-success">确定</button>
+        <td bgcolor="#f8f8f8" colspan="5" align="center" class="py-3">
+          <button type="submit" class="btn btn-success">保存</button>
         </td>
       </tr>
     </form>

src/admin/templets/member_view.htm

@@ -177,9 +177,8 @@ function checkSubmit()
             </td> 
           </tr>
           <tr> 
-            <td height="36"></td>
-            <td height="36" align="left">
-              <button type="submit" name="Submit" class="btn btn-success btn-sm">确定修改</button> 
+            <td colspan="2" class="py-3">
+              <button type="submit" name="Submit" class="btn btn-success btn-sm">确定保存</button> 
               <button type="reset" name="Submit22" class="btn btn-success btn-sm">重置表单</button>
               <button type="button" onclick="javascript:history.go(-1);" class="btn btn-success btn-sm">不理返回</button>
             </td>

src/admin/templets/module_edit.htm

@@ -209,7 +209,7 @@ td{padding-left:8px}
       </td>
     </tr>
     <tr bgcolor="#f8f8f8">
-      <td height="36" colspan="2" align="center" style="padding-left:10px">
+      <td colspan="2" align="center" class="py-3" style="padding-left:10px">
         <button name="imageField" type="submit" class="btn btn-success">提交</button>
         <button name="button" id="button" onClick="location='plus_main.php';" class="btn btn-success">返回</button>
       </td>

src/admin/templets/module_main.htm

@@ -74,7 +74,7 @@
         ?>
         </td>
         <td>
-          <div id='manager_<?php echo $v['hash']; ?>'<?php if(!file_exists(DEDEDATA."/module/{$v['hash']}.xml")) echo 'style="display:none;"'?>>
+          <div id='manager_<?php echo $v['hash']; ?>'<?php if(!file_exists(DEDEDATA."/module/{$v['hash']}.xml")) echo 'style="display:none"'?>>
             <a class="btn btn-success btn-sm" href="module_main.php?action=view_developoer&hash=<?php echo $v['hash']; ?>">开发者</a>
             <a class="btn btn-success btn-sm" href="module_main.php?action=showreadme&hash=<?php echo $v['hash']; ?>">说明</a>
             <a class="btn btn-success btn-sm" href="module_main.php?action=view&hash=<?php echo $v['hash']; ?>">详情</a>

src/admin/templets/mychannel_add.htm

@@ -58,8 +58,7 @@
       <tr>
         <td bgcolor="#ffffff">
           名字标识<br>
-          <span class="STYLE2" id="help2">与文档的模板相关连，建议由英文、数字或下划线组成，因为部份Unix系统无法识别中文文件，频道默认文档模板是
-            “default/article_名字标识.htm”，列表模板、封面模板类推 </span>
+          <span class="STYLE2" id="help2">与文档的模板相关连，建议由英文、数字或下划线组成，因为部份Unix系统无法识别中文文件，频道默认文档模板是“default/article_名字标识.htm”，列表模板、封面模板类推 </span>
         </td>
         <td bgcolor="#ffffff">
           <input name="nid" type="text" id="nid" value="ch<?php echo $newid; ?>" class="pubinputs"> *
@@ -235,13 +234,10 @@
       </tr>
       <tr bgcolor="#f8f8f8">
         <td height="30" colspan="2">
-          <table width="100%" border="0" cellspacing="0" cellpadding="0" class="table table-borderless">
+          <table width="100%" border="0" cellspacing="0" cellpadding="0" class="table table-borderless mb-0">
             <tr>
-              <td width="30%"></td>
-              <td width="15%">
-                <button type="submit" class="btn btn-success">确定</button>
-              </td>
-              <td width="59%">
+              <td align="center" class="py-3">
+                <button type="submit" class="btn btn-success">保存</button>
                 <button type="button" onClick="location='mychannel_main.php';" class="btn btn-success">返回</button>
               </td>
             </tr>

src/admin/templets/mychannel_edit.htm

@@ -364,8 +364,8 @@ if($ft==1)
         <td height="36" colspan="2">
           <table width="100%" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td align="center">
-                <button type="submit" class="btn btn-success">确定</button>
+              <td align="center" class="py-3">
+                <button type="submit" class="btn btn-success">保存</button>
                 <button type="button" onClick="location='mychannel_main.php';" class="btn btn-success">返回</button>
               </td>
             </tr>

src/admin/templets/mychannel_field_add.htm

@@ -261,16 +261,13 @@ td{ padding:6px; padding-left:6px; line-height:26px }
       <td height="26" colspan="2" bgcolor="#f8f8f8">
 	     <table width="100%" border="0" cellspacing="0" cellpadding="0" class="table table-borderless">
           <tr> 
-            <td width="30%" height="36"></td>
-            <td width="10%">
-            <button type="submit" name="button1" id="button1" class="btn btn-success">确定</button>
-            </td>
-            <td>
-            <button type="reset" name="button2" id="button2" class="btn btn-success">重置</button>
+            <td align="center" class="py-3">
+              <button type="submit" name="button1" id="button1" class="btn btn-success">保存</button>
+              <button type="reset" name="button2" id="button2" class="btn btn-success">重置</button>
             </td>
           </tr>
         </table>
-        </td>
+      </td>
     </tr>
 </table>
 </form>

src/admin/templets/mychannel_field_edit.htm

@@ -241,10 +241,9 @@
         <td height="26" colspan="2" bgcolor="#f8f8f8">
           <table width="100%" border="0" cellspacing="0" cellpadding="0" class="table table-borderless">
             <tr>
-              <td width="30%" height="36"></td>
-              <td width="10%"><button type="submit" name="button1" id="button1" class="btn btn-success">确定</button>
-              </td>
-              <td><button type="reset" name="button3" id="button3" class="btn btn-success">重置</button>
+               <td align="center" class="py-3">
+                <button type="submit" name="button1" id="button1" class="btn btn-success">保存</button>
+                <button type="reset" name="button3" id="button3" class="btn btn-success">重置</button>
               </td>
             </tr>
           </table>

src/admin/templets/mychannel_main.htm

@@ -53,7 +53,7 @@
       </td>
     </tr>
     {/dede:datalist}
-    <tr align="center" bgcolor="#f8f8f8" height="26">
+    <tr align="center" bgcolor="#f8f8f8" height="36">
       <td colspan="7">{dede:pagelist listsize='6'/}</td>
     </tr>
     <tr align="center" bgcolor="#ffffff" height="36">

src/admin/templets/mychannel_modifysearch.htm

@@ -76,8 +76,8 @@
         <td height="26" colspan="2">
           <table width="100%" border="0" cellspacing="0" cellpadding="0" class="table table-borderless">
             <tr>
-              <td height="36" align="center">
-                <button type="submit" class="btn btn-success btn-sm">确定</button>
+               <td align="center" class="py-3">
+                <button type="submit" class="btn btn-success btn-sm">保存</button>
                 <button type="button" onclick="location='mychannel_main.php';" class="btn btn-success btn-sm">返回</button>
               </td>
             </tr>

src/admin/templets/mynews_add.htm

@@ -73,7 +73,7 @@ function checkSubmit()
            </td>
           </tr>
           <tr> 
-            <td height="172" valign="top" align="right">信息内容：</td>
+            <td height="172" align="right">信息内容：</td>
             <td height="172"> 
               <?php
 	GetEditor("body","",250,"Small");

src/admin/templets/mynews_edit.htm

@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
 <title>站内新闻发布</title>
-<link rel='stylesheet' href='../static/web/css/admin.css'>
+<link rel="stylesheet" href="../static/web/css/admin.css">
 <script>
 function checkSubmit()
 {
@@ -71,7 +71,7 @@ function checkSubmit()
             <td  align="left"><input name="sdate" type="text" id="sdate" size="25" value="<?php echo GetDateTimeMk($myNews['senddate'])?>"></td>
           </tr>
           <tr> 
-            <td height="172" valign="top" align="right">信息内容：</td>
+            <td height="172" align="right">信息内容：</td>
             <td height="172"> 
               <?php
 	GetEditor("body",$myNews['body'],250,"Small");

src/admin/templets/mynews_main.htm

@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
 <title>站内新闻管理</title>
-<link rel='stylesheet' href='../static/web/css/admin.css'>
+<link rel="stylesheet" href="../static/web/css/admin.css">
 </head>
 <body>
 <table width="98%" border="0" align="center" cellpadding="2" cellspacing="1">
@@ -40,7 +40,7 @@
   </tr>
   {/dede:datalist}
   <tr align="center" bgcolor="#F9FBF2"> 
-    <td height="26" colspan="6">{dede:pagelist listsize='6'/}</td>
+    <td height="36" colspan="6">{dede:pagelist listsize='6'/}</td>
   </tr>
 </table>
 </body>

src/admin/templets/mytag_add.htm

@@ -5,7 +5,7 @@
   <title>增加自定义标记</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='stylesheet' href='../static/web/css/admin.css'>
+  <link rel="stylesheet" href="../static/web/css/admin.css">
   <link rel="stylesheet" href="../static/web/css/daterangepicker.css">
   <script src="../static/web/js/jquery.min.js" language="javascript" type="text/javascript"></script>
   <script src="../static/web/js/bootstrap.bundle.min.js"></script>
@@ -59,16 +59,14 @@
       <td height="26" background="../static/web/img/tbg.gif" style="padding-left:10px"><a href="mytag_main.php">自定义标记管理</a> &gt; 增加新标记</td>
     </tr>
     <tr>
-      <td height="200" bgcolor="#ffffff" valign="top">
+      <td height="200" bgcolor="#ffffff">
         <table width="100%" border="0" cellspacing="4" cellpadding="4" class="table table-borderless">
-          <form action="mytag_add.php" method="post" enctype="multipart/form-data" name="form1"
-            onSubmit="return checkSubmit()">
+          <form action="mytag_add.php" method="post" enctype="multipart/form-data" name="form1" onSubmit="return checkSubmit()">
             <input type='hidden' name='dopost' value='save' />
             <input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token']; ?>">
             <tr>
               <td height="26" colspan="3">自定义标记的调用方法：<br>
-                {dede:mytag name='标记名称' ismake='是否含板块代码（yes 或 no）' typeid='栏目ID'/}
-                <br>
+                {dede:mytag name='标记名称' ismake='是否含板块代码（yes 或 no）' typeid='栏目ID'/}<br>
                 1、name 标记名称，该项是必须的属性，以下 2、3是可选属性；<br>
                 2、ismake 默认是 no 表示设定的纯HTML代码， yes 表示含板块标记的代码；<br>
                 3、typeid 表示所属栏目的ID，默认为 0 ，表示所有栏目通用的显示内容，在列表和文档模板中，typeid默认是这个列表或文档本身的栏目ＩＤ</td>
@@ -101,34 +99,25 @@
             </tr>
             <tr>
               <td height="26" align="center">开始时间：</td>
-              <td colspan="2">
-                <input name="starttime" type="text" id="starttime" value="<?php echo $startDay?>" class="datepicker">
-              </td>
+              <td colspan="2"><input name="starttime" type="text" id="starttime" value="<?php echo $startDay?>" class="datepicker"></td>
             </tr>
             <tr>
               <td height="26" align="center">结束时间：</td>
-              <td colspan="2">
-                <input name="endtime" type="text" id="endtime" value="<?php echo $endDay?>" class="datepicker">
-              </td>
+              <td colspan="2"><input name="endtime" type="text" id="endtime" value="<?php echo $endDay?>" class="datepicker"></td>
             </tr>
             <tr>
               <td height="80" align="center">正常显示内容：</td>
-              <td width="76%">
-                <textarea name="normbody" id="normbody" style="width:80%;height:100px"></textarea>
-              </td>
+              <td width="70%"><textarea name="normbody" id="normbody" style="width:80%;height:100px"></textarea></td>
               <td width="9%"></td>
             </tr>
             <tr>
               <td height="80" align="center">过期显示内容：</td>
-              <td>
-                <textarea name="expbody" id="expbody" style="width:80%;height:100px"></textarea>
-              </td>
+              <td><textarea name="expbody" id="expbody" style="width:80%;height:100px"></textarea></td>
               <td></td>
             </tr>
             <tr>
-              <td height="53" align="center"></td>
-              <td colspan="2">
-                <button type="submit" class="btn btn-success">确定</button>
+              <td colspan="3" align="center" class="py-3">
+                <button type="submit" class="btn btn-success">保存</button>
               </td>
             </tr>
           </form>

src/admin/templets/mytag_edit.htm

@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
 <title>修改标记</title>
-<link rel='stylesheet' href='../static/web/css/admin.css'>
+<link rel="stylesheet" href="../static/web/css/admin.css">
 </head>
 <body>
 <table width="98%" border="0" align="center" cellpadding="3" cellspacing="1">
@@ -11,7 +11,7 @@
   <td height="26" background="../static/web/img/tbg.gif"  style="padding-left:10px"><a href="mytag_main.php">自定义标记管理</a> &gt; 修改标记</td>
 </tr>
 <tr>
-    <td height="200" bgcolor="#ffffff" valign="top">
+    <td height="200" bgcolor="#ffffff">
 	<table width="100%" border="0" cellspacing="4" cellpadding="4">
         <form action="mytag_edit.php" method="post" enctype="multipart/form-data" name="form1">
           <input type='hidden' name='aid' value='<?php echo $aid?>'>
@@ -51,7 +51,7 @@
           </tr>
           <tr> 
             <td height="80" align="center">正常显示内容：</td>
-            <td width="76%">
+            <td width="70%">
 			<textarea name="normbody" id="normbody" style="width:80%;height:100px"><?php echo $row['normbody']?></textarea> 
             </td>
             <td width="9%"></td>

src/admin/templets/mytag_tag_guide.htm

@@ -51,7 +51,7 @@
           <td height="26" align="left" background="../static/web/img/tbg.gif" style="padding-left:10px"><a href="mytag_main.php" align="left">自定义标记管理</a> &gt; 智能标记生成向导</td>
         </tr>
         <tr>
-          <td height="265" valign="top" bgcolor="#ffffff">
+          <td height="265" bgcolor="#ffffff">
             <table width="99%" border="0" align="right" cellpadding="0" cellspacing="0" style="text-align:left" class="table table-borderless">
               <tr>
                 <td height="26">列表样式：</td>
@@ -135,7 +135,7 @@
               </tr>
               <tr>
                 <td height="26">排列顺序：
-                  <select name="orderby" id="orderby" style="width:120">
+                  <select name="orderby" id="orderby" style="width:160px">
                     <option value="sortrank">置顶权限值</option>
                     <option value="pubdate" selected>发布时间</option>
                     <option value="senddate">录入时间</option>
@@ -190,10 +190,10 @@
         </tr>
       </form>
       <tr>
-        <td valign="top" height="26" bgcolor="#f8f8f8" align="left">输出结果：</td>
+        <td height="26" bgcolor="#f8f8f8" align="left">输出结果：</td>
       </tr>
       <tr>
-        <td height="150" valign="top" bgcolor="#ffffff">
+        <td height="150" bgcolor="#ffffff">
           <div id='mdv' style='width:100%;height:130;'>
             <iframe name="stafrm" frameborder="0" id="stafrm" width="100%" height="100%"></iframe>
           </div>

src/admin/templets/plus_main.htm

@@ -6,7 +6,7 @@
   <title>插件管理</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='stylesheet' href='../static/web/css/admin.css'>
+  <link rel="stylesheet" href="../static/web/css/admin.css">
 </head>
 <body>
   <table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" class="table maintable mt-3">

src/admin/templets/public_guide.htm

@@ -43,7 +43,7 @@
 <body>
 <table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" style="border:1px solid #dee2e6;" class="table maintable table-borderless mt-3">
   <tr align="center">
-    <td height="120" align="left" valign="top" bgcolor="#ffffff">
+    <td height="120" align="left" bgcolor="#ffffff">
 	<table width="100%" border="0" cellspacing="0" cellpadding="6">
       <tr>
         <td>内容发布说明<br>

src/admin/templets/recycling.htm

@@ -107,7 +107,7 @@
 			</tr>
 		</form>
 		<tr align="right" bgcolor="#f8f8f8">
-			<td height="30" colspan="7" align="center">{dede:pagelist listsize='6'/}</td>
+			<td height="36" colspan="7" align="center">{dede:pagelist listsize='6'/}</td>
 		</tr>
 	</table>
 </body>

src/admin/templets/shops_delivery.htm

@@ -79,7 +79,7 @@
                   <input name="m_dname<?php echo $rs['pid']; ?>" type="text" value="<?php echo $rs['dname']; ?>">
                   <a class="btn btn-success btn-sm" href="shops_delivery.php?do=del&id=<?php echo $rs['pid']; ?>" onClick="return(confirm('删除后无法恢复，您确定删除吗'))">删除</a>
                 </td>
-                <td width="70%" align="left" valign="top">
+                <td width="70%" align="left">
                   手续费：<input name="m_price<?php echo $rs['pid']; ?>" type="text" id="m_price<?php echo $rs['pid']; ?>" value="<?php echo $rs['price']; ?>" style="width:60px">
                   元
                   <textarea name="m_des<?php echo $rs['pid']; ?>" id="m_des<?php echo $rs['pid']; ?>" style="width:360px;height:50px"><?php echo $rs['des']; ?></textarea>
@@ -90,8 +90,8 @@
           </td>
         </tr>
         <tr bgcolor="#F3FFDD">
-          <td height="36" colspan="3" bgcolor="#f8f8f8" align="center">
-            <button name="imageField2" type="submit" class="btn btn-success">确定</button>
+          <td bgcolor="#f8f8f8" colspan="3" align="center" class="py-3">
+            <button name="imageField2" type="submit" class="btn btn-success">保存</button>
           </td>
         </tr>
       </table>

src/admin/templets/soft_add.htm

@@ -153,7 +153,7 @@ table{border-collapse:separate}
                 <button type="button" name="Submit2" onClick="SelectImage('form1.picname','small');" class='btn btn-success btn-sm'>选择图片</button>
                 <button id="btnClearAll" type="button" class="btn btn-success btn-sm delete">清空</button>
               </td>
-              <td width="150" align="center"><img id="litPic" src="../static/web/img/defaultpic.jpg" style="height:80px"></td>
+              <td width="160" align="center"><img id="litPic" src="../static/web/img/defaultpic.jpg" style="height:80px"></td>
             </tr>
           </table>
         </td>
@@ -538,8 +538,8 @@ table{border-collapse:separate}
       </tr>
     </table>
     <table width="98%" border="0" cellspacing="0" cellpadding="0" align="center" bgcolor="#f8f8f8" style="border:1px solid #dee2e6;border-top:0" class="mb-3">
-      <tr height="36">
-        <td align="center" style="padding:.6rem">
+      <tr>
+        <td align="center" class="py-3">
           <button type="submit" class="btn btn-success">保存</button>
           <button type="button" onClick="location.reload();" class="btn btn-success">重置</button>
         </td>

src/admin/templets/soft_config.htm

@@ -143,11 +143,11 @@
         <td height="26" colspan="2" bgcolor="#f8f8f8" style="padding-left:10px">下载说明：</td>
       </tr>
       <tr>
-        <td height="62" colspan="2" bgcolor="#ffffff"><?php GetEditor('downmsg',$row['downmsg'],250); ?></td>
+        <td height="60" colspan="2" bgcolor="#ffffff"><?php GetEditor('downmsg',$row['downmsg'],250); ?></td>
       </tr>
       <tr>
-        <td height="36" colspan="2" bgcolor="#f8f8f8" align="center">
-          <button type="submit" name="Submit" class="btn btn-success">保存设置</button>　　　　
+        <td bgcolor="#f8f8f8" colspan="2" align="center" class="py-3">
+          <button type="submit" name="Submit" class="btn btn-success">保存设置</button>
           <button type="reset" name="rset" id="rset" class="btn btn-success">重置</button>
         </td>
       </tr>

src/admin/templets/soft_edit.htm

@@ -494,8 +494,8 @@ table{border-collapse:separate}
       </tr>
     </table>
     <table width="98%" border="0" cellspacing="0" cellpadding="0" align="center" bgcolor="#f8f8f8" style="border:1px solid #dee2e6;border-top:0" class="mb-3">
-    <tr height="36">
-      <td align="center" style="padding:.6rem">
+    <tr>
+      <td align="center" class="py-3">
         <button type="submit" class="btn btn-success">保存</button>
         <button type="button" onClick="location.reload();" class="btn btn-success">重置</button>
       </td>