Merge remote-tracking branch 'origin/user' into develop

src/admin/archives_do.php

@@ -273,47 +273,6 @@ else if ($dopost == "checkArchives") {
     ShowMsg("成功审核指定的文档", $ENV_GOBACK_URL);
     exit();
 }
-/*--------------------------
-//删除文档
-function delArchives(){ }
----------------------------*/
-else if ($dopost == "delArchives") {
-    CheckPurview('a_Del,a_AccDel,a_MyDel,sys_ArcBatch');
-    require_once(DEDEINC."/libraries/oxwindow.class.php");
-    if (empty($fmdo)) $fmdo = '';
-
-    if ($fmdo == 'yes') {
-        if (!empty($aid) && empty($qstr)) {
-            $qstr = $aid;
-        }
-        if ($qstr == '') {
-            ShowMsg("参数无效", $ENV_GOBACK_URL);
-            exit();
-        }
-        $qstrs = explode("`", $qstr);
-        $okaids = array();
-        foreach ($qstrs as $aid) {
-            if (!isset($okaids[$aid])) {
-                DelArc($aid);
-            } else {
-                $okaids[$aid] = 1;
-            }
-        }
-        ShowMsg("成功删除指定的文档", $ENV_GOBACK_URL);
-        exit();
-    } else {
-        $wintitle = "文档管理-删除文档";
-        $wecome_info = "<a href='".$ENV_GOBACK_URL."'>文档管理</a>::删除文档";
-        $win = new OxWindow();
-        $win->Init("archives_do.php", "js/blank.js", "POST");
-        $win->AddHidden("fmdo", "yes");
-        $win->AddHidden("dopost", $dopost);
-        $win->AddHidden("qstr", $qstr);
-        $win->AddTitle("您确定要删除 $qstr 文档");
-        $winform = $win->GetWindow("ok");
-        $win->Display();
-    }
-}
 /*-----------------------------
 function moveArchives(){ }
 ------------------------------*/
@@ -348,14 +307,14 @@ else if ($dopost == 'moveArchives') {
         <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'>
+                <input type="text" name="tmpids" value="<?php echo $qstr; ?>" style="width:320px;overflow:hidden">
                 <br>移动到的目标栏目必须和选定的文档频道类型一致，否则程序会自动勿略不符合的文档
             </td>
         </tr>
         <tr>
             <td colspan="2" align="center" class="py-3">
-                <button type='submit' class='btn btn-success btn-sm'>保存</button>
-                <button type='button' onclick='HideObj("<?php echo $divname; ?>");ChangeFullDiv("hide");' class='btn btn-success btn-sm'>关闭</button>
+                <button type="submit" class="btn btn-success btn-sm">保存</button>
+                <button type="button" onclick="HideObj('<?php echo $divname; ?>');ChangeFullDiv('hide');" class="btn btn-success btn-sm">关闭</button>
             </td>
         </tr>
         </table>
@@ -428,6 +387,48 @@ else if ($dopost == 'return') {
     ShowMsg("成功还原指定的文档", "recycling.php");
     exit();
 }
+/*--------------------------
+//删除文档
+function delArchives(){ }
+---------------------------*/
+else if ($dopost == "delArchives") {
+    CheckPurview('a_Del,a_AccDel,a_MyDel,sys_ArcBatch');
+    require_once(DEDEINC."/libraries/oxwindow.class.php");
+    if (empty($fmdo)) $fmdo = '';
+
+    if ($fmdo == 'yes') {
+        if (!empty($aid) && empty($qstr)) {
+            $qstr = $aid;
+        }
+        if ($qstr == '') {
+            ShowMsg("参数无效", $ENV_GOBACK_URL);
+            exit();
+        }
+        $qstrs = explode("`", $qstr);
+        $okaids = array();
+        foreach ($qstrs as $aid) {
+            if (!isset($okaids[$aid])) {
+                DelArc($aid);
+            } else {
+                $okaids[$aid] = 1;
+            }
+        }
+        ShowMsg("成功删除指定的文档", $ENV_GOBACK_URL);
+        exit();
+    } else {
+        $wintitle = "文档管理-删除文档";
+        $wecome_info = "<a href='".$ENV_GOBACK_URL."'>文档管理</a>::删除文档";
+        $win = new OxWindow();
+        $win->Init("archives_do.php", "js/blank.js", "POST");
+        $win->AddHidden("fmdo", "yes");
+        $win->AddHidden("dopost", $dopost);
+        $win->AddHidden("qstr", $qstr);
+        $win->AddHidden("recycle", $recycle);
+        $win->AddTitle("您确定要删除，序号 $qstr 文档");
+        $winform = $win->GetWindow("ok");
+        $win->Display();
+    }
+}
 /*-----------------------------
 //清空文档
 function RbClearArchives(){ }
@@ -476,9 +477,8 @@ else if ($dopost == 'clear') {
         $win->AddHidden("fmdo", "yes");
         $win->AddHidden("dopost", $dopost);
         $win->AddHidden("qstr", $qstr);
-        $win->AddHidden("aid", $aid);
         $win->AddHidden("recycle", $recycle);
-        $win->AddTitle("本次操作将清空回收站所有共 $num 篇文档<br>您确定要永久删除 $qstr 这些文档");
+        $win->AddTitle("本次操作将清空回收站 $num 篇文档<br>您确定要删除，序号 $qstr 文档");
         $winform = $win->GetWindow("ok");
         $win->Display();
     }
@@ -518,7 +518,7 @@ else if ($dopost == 'del') {
         $win->AddHidden("dopost", $dopost);
         $win->AddHidden("qstr", $qstr);
         $win->AddHidden("recycle", $recycle);
-        $win->AddTitle("您确定要删除 $qstr 文档");
+        $win->AddTitle("您确定要删除，序号 $qstr 文档");
         $winform = $win->GetWindow("ok");
         $win->Display();
     }
@@ -560,7 +560,7 @@ else if ($dopost == 'quickEdit') {
     <tr>
         <td width="86" height="26" class="bline">&nbsp;属性：</td>
         <td class="bline">
-            <input type='hidden' name='oldflag' value='<?php echo $arcRow['flag']; ?>'>
+            <input type="hidden" name="oldflag" value="<?php echo $arcRow['flag']; ?>">
             <?php
             $dsql->SetQuery("SELECT * FROM `#@__arcatt` ORDER BY sortid ASC");
             $dsql->Execute();
@@ -606,8 +606,8 @@ else if ($dopost == 'quickEdit') {
     </tr>
     <tr>
         <td colspan="2" align="center" class="py-3">
-            <button type='submit' class='btn btn-success btn-sm'>保存</button>
-            <button type='button' onclick='HideObj("<?php echo $divname; ?>");ChangeFullDiv("hide");' class='btn btn-success btn-sm'>关闭</button>
+            <button type="submit" class="btn btn-success btn-sm">保存</button>
+            <button type="button" onclick="HideObj('<?php echo $divname; ?>');ChangeFullDiv('hide');" class="btn btn-success btn-sm">关闭</button>
         </td>
     </tr>
     </table>
@@ -878,12 +878,12 @@ else if ($dopost == 'attsDlg') {
     </tr>
     <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>
+        <td class="bline"><input type="text" name="tmpids" value="<?php echo $qstr; ?>" style='width:320px;overflow:hidden'></td>
     </tr>
     <tr>
         <td colspan="2" align="center" class="py-3">
-            <button type='submit' class='btn btn-success btn-sm'>保存</button>
-            <button type='button' onclick='HideObj("<?php echo $divname; ?>");ChangeFullDiv("hide");' class='btn btn-success btn-sm'>关闭</button>
+            <button type="submit" class="btn btn-success btn-sm">保存</button>
+            <button type="button" onclick="HideObj('<?php echo $divname; ?>');ChangeFullDiv('hide');" class="btn btn-success btn-sm">关闭</button>
         </td>
     </tr>
     </table>
@@ -905,11 +905,11 @@ else if ($dopost == 'getCatMap') {
     echo "</div>";
     $tus = new TypeUnitSelector();
     ?>
-    <form name='quicksel' action='javascript:;' method='get'>
-        <div class='quicksel'><?php $tus->ListAllType($channelid); ?></div>
-        <div align='center' class='quickselfoot'>
-            <button onclick='getSelCat("<?php echo $targetid; ?>");' class='btn btn-success btn-sm'>保存</button>
-            <button type='button' onclick='HideObj("<?php echo $divname; ?>");ChangeFullDiv("hide");' class='btn btn-success btn-sm'>关闭</button>
+    <form name="quicksel" action="javascript:;" method="get">
+        <div class="quicksel"><?php $tus->ListAllType($channelid); ?></div>
+        <div align="center" class="quickselfoot">
+            <button onclick="getSelCat('<?php echo $targetid; ?>');" class="btn btn-success btn-sm">保存</button>
+            <button type="button" onclick="HideObj('<?php echo $divname; ?>');ChangeFullDiv('hide');" class="btn btn-success btn-sm">关闭</button>
         </div>
     </form>
 <?php

src/admin/article_coonepage_rule.php

@@ -51,31 +51,27 @@ else if ($action == 'editload') {
   $row = $dsql->GetOne("SELECT * FROM `#@__co_onepage` WHERE id='$id' ");
   AjaxHead();
 ?>
-  <form name='addform' action='article_coonepage_rule.php' method='post'>
-    <input type='hidden' name='id' value='<?php echo $id; ?>' />
-    <input type='hidden' name='action' value='editsave' />
+  <form name="addform" action="article_coonepage_rule.php" method="post">
+    <input type="hidden" name="id" value="<?php echo $id; ?>">
+    <input type="hidden" name="action" value="editsave">
     <table width="430" cellspacing="0" cellpadding="0">
       <tr>
         <td width="102" height="26">网站名称：</td>
-        <td width="302"><input name="title" type="text" id="title" style="width:200px" value="<?php echo $row['title']; ?>" /></td>
+        <td width="302"><input name="title" type="text" id="title" style="width:200px" value="<?php echo $row['title']; ?>"></td>
         <td width="26" align="center"><a href="javascript:CloseEditNode()" class="mr-3"><i class="fa fa-window-close-o"></i></a></td>
       </tr>
       <tr>
         <td height="26">原内容编码：</td>
         <td colspan="2">
-          <label><input type="radio" name="lang" value="utf-8" <?php echo ($row['lang'] == 'utf-8' ? ' checked="checked" ' : ''); ?> />
-            UTF-8</label>
-          <label><input type="radio" name="lang" value="gb2312" <?php echo ($row['lang'] == 'gb2312' ? ' checked="checked" ' : ''); ?> />
-            GB2312/GBK</label>
+          <label><input type="radio" name="lang" value="utf-8" <?php echo ($row['lang'] == 'utf-8' ? ' checked="checked" ' : ''); ?>> UTF-8</label>
+          <label><input type="radio" name="lang" value="gb2312" <?php echo ($row['lang'] == 'gb2312' ? ' checked="checked" ' : ''); ?>> GB2312/GBK</label>
         </td>
       </tr>
       <tr>
         <td height="26">用作文章来源：</td>
         <td colspan="2">
-          <label><input type="radio" name="issource" value="0" <?php echo ($row['issource'] == 0 ? ' checked="checked" ' : ''); ?> />
-            否</label>
-          <label><input name="issource" type="radio" value="1" <?php echo ($row['issource'] == 1 ? ' checked="checked" ' : ''); ?> />
-            是</label>
+          <label><input type="radio" name="issource" value="0" <?php echo ($row['issource'] == 0 ? ' checked="checked" ' : ''); ?>> 否</label>
+          <label><input name="issource" type="radio" value="1" <?php echo ($row['issource'] == 1 ? ' checked="checked" ' : ''); ?>> 是</label>
         </td>
       </tr>
       <tr>
@@ -101,8 +97,10 @@ else if ($action == 'editload') {
       </tr>
       <tr>
         <td height="26"></td>
-        <td colspan="2"><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>
+        <td colspan="2">
+          <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>
     </table>
   </form>

src/admin/sys_admin_user_tj.php

@@ -95,8 +95,8 @@ if (isset($dopost) && $dopost == 'getone') {
     $ccd = $row['cc'] + $ccd;
     $msg = "<table width='100%' align='center' cellpadding='3' cellspacing='1'>
     <tr align='center' bgcolor='#F8FCF1'>
-      <td width='18%' height='26'>管理员::统计信息</td>
-      <td width='18%'>全部(文档|点击)</td>
+      <td width='18%' height='26'>管理员</td>
+      <td width='18%'>文档与点击</td>
       <td width='16%'>季度</td>
       <td width='16%'>当月</td>
       <td width='16%'>近七天</td>
@@ -110,7 +110,7 @@ if (isset($dopost) && $dopost == 'getone') {
       <td>{$ddw} | {$ccw}</td>
       <td>{$ddd} | {$ccd}</td>
     </tr>
-    </table><br style='clear:both'/>\r\n";
+    </table>";
     AjaxHead();
     echo $msg;
     exit();

src/admin/templets/article_coonepage_rule.htm

@@ -183,7 +183,7 @@
 				</tr>
 				<tr>
 					<td colspan="3" align="center" class="py-3">
-						<button class="btn btn-success btn-sm" type="submit" name="Submit" value="">保存规则</button>
+						<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/file_edit.htm

@@ -51,7 +51,6 @@
 				<tr>
 					<td bgcolor="#f8f8f8" colspan="2" align="center" class="py-3">
 						<button type="submit" name="B1" class="btn btn-success btn-sm">保存</button>
-						<button type="reset" name="B2" class="btn btn-success btn-sm">重置</button>
 						<button type="button" name="B4" class="btn btn-success btn-sm" onClick="javascript:history.go(-1);">返回</button>
 					</td>
 				</tr>

src/admin/templets/freelist_add.htm

@@ -133,7 +133,7 @@
                 </td>
               </tr>
               <tr>
-                <td height="26" align="left" style="background:#F8FCF1;"><img src="../static/web/img/file_tt.gif">列表样式：（这里是定义自由列表模板里的{dede:freelist/}标记的样式和属性）</td>
+                <td height="26" align="left" style="background:#F8FCF1">列表样式：这里是定义自由列表模板里的{dede:freelist/}标记的样式和属性</td>
               </tr>
               <tr>
                 <td align="left">

src/admin/templets/freelist_edit.htm

@@ -120,7 +120,7 @@
                 </td>
               </tr>
               <tr>
-                <td height="26" align="left" style="background:#F8FCF1;"><img src="../static/web/img/file_tt.gif">列表样式：（这里是定义自由列表模板里的{dede:freelist/}标记的样式和属性）</td>
+                <td height="26" align="left" style="background:#F8FCF1">列表样式：这里是定义自由列表模板里的{dede:freelist/}标记的样式和属性</td>
               </tr>
               <tr>
                 <td height="26" align="left">限定栏目：

src/admin/templets/media_edit.htm

@@ -33,9 +33,8 @@
 			<td height="26" background="../static/web/img/tbg.gif">
 				<table width="98%" cellpadding="0" cellspacing="0" class="table table-borderless">
 					<tr>
-						<td width="2%" align="center" valign="middle"><img src="../static/web/img/item_tt2.gif"></td>
-						<td width="44%">修改媒体：</td>
-						<td width="54%" align="right"><a href='media_main.php' class="btn btn-success btn-sm">附件/媒体数据管理</a></td>
+						<td width="70%">修改媒体</td>
+						<td width="30%" align="right"><a href='media_main.php' class="btn btn-success btn-sm">附件媒体数据管理</a></td>
 					</tr>
 				</table>
 			</td>

src/admin/templets/member_toadmin.htm

@@ -103,8 +103,7 @@
             </tr>
             <tr>
               <td colspan="2" align="center" 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="submit" name="Submit" class="btn btn-success btn-sm">保存</button>
                 <button type="button" onclick="javascript:history.go(-1);" class="btn btn-success btn-sm">返回</button>
               </td>
             </tr>

src/admin/templets/member_view.htm

@@ -178,7 +178,6 @@
           <tr> 
             <td colspan="2" align="center" 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>
           </tr>

src/admin/templets/sys_group_add.htm

@@ -9,93 +9,83 @@
   <link rel="stylesheet" href="../static/web/css/admin.css">
 </head>
 <body>
-    <table width="98%" cellpadding="2" cellspacing="1" align="center" class="table maintable mt-3 mb-3">
-      <form name='form1' action='sys_group_add.php' method='post'>
-        <input type='hidden' name='dopost' value='save'>
-        <tr>
-          <td height="26" background="../static/web/img/tbg.gif" align="left" style="padding-left:10px"><a href='sys_group.php'>系统用户组管理</a> &gt; 增加用户组</td>
-        </tr>
-        <tr>
-          <td align="center">
-            <table width="98%" cellspacing="0" cellpadding="0" class="table table-borderless">
-              <tr>
-                <td width="9%" height="26">组名称：</td>
-                <td width="91%" style="text-align:left"> <input name="groupname" type="text" id="groupname">
-                </td>
-              </tr>
-              <tr>
-                <td width="9%" height="26">级别值：</td>
-                <td width="91%" style="text-align:left"> <input name="rankid" type="text" id="rankid" size="6">
-                  （数字，系统已占用的级别值：
-                  <?php
-          	
-          	$dsql->SetQuery("Select `rank` From `#@__admintype`");
-          	$dsql->Execute();
-          	while($row = $dsql->GetObject()) echo '<span style=\'color:#e74d58\'>'.$row->rank.'</span>';
-          	?>
-                  ，级别值必须小于10，超过或等于10所有权限设置将无效(超级管理员)，如果10个组不能完全满足您的要求，允许使用小数）</td>
-              </tr>
-              <?php
-        $start = 0;
-        $k = 0;
-        $gouplists = file(dirname(__FILE__).'/../inc/grouplist.txt');
-        foreach($gouplists as $line)
-        {
-        	$line = trim($line);
-        	if($line=="") continue;
-        	if(preg_match("#^>>#", $line))
-        	{
-        		if($start>0) echo "</td></tr>";
-        		$start++;
-        		$lhead = "
-        	 <tr> 
-           <td height='26' colspan='2' bgcolor='#F9FAF3' style='text-align:left;line-height:22px'>{$start}、".str_replace('>>','',$line)."</td></tr>
-           <tr><td height='26' colspan='2' style='text-align:left;line-height:22px'>
-        		"; 
-        		echo $lhead;
-        	}
-        	else if(preg_match("#^>#", $line))
-        	{
-        		$ls = explode('>',$line);
-        		$tag = $ls[1];
-        		$tagname = str_replace('[br]', '<br>', $ls[2]);
-        		if(!preg_match("#<br \/>#", $tagname) ) $tagname .= "<span>($tag)</span>";
-        		else $tagname = str_replace('<br>', "<span>($tag)</span><br>", $tagname);
-        		echo " <label><input name='purviews[]' type='checkbox' class='np' id='purviews$k' value='$tag'> $tagname</label>";
-        	  $k++;
-        	}
-        }
-        $start++;
-        ?>
-          </td>
-        </tr>
-        <tr>
-          <td height='26' colspan='2' bgcolor='#F9FAF3' style="text-align:left"><?php echo $start?>、插件权限</td>
-        </tr>
-        <tr>
-          <td height='26' colspan='2' style='text-align:left'>
+  <table width="98%" cellpadding="2" cellspacing="1" align="center" class="table maintable mt-3 mb-3">
+    <form name='form1' action='sys_group_add.php' method='post'>
+      <input type='hidden' name='dopost' value='save'>
+      <tr>
+        <td height="26" background="../static/web/img/tbg.gif" align="left" style="padding-left:10px"><a href='sys_group.php'>系统用户组管理</a> &gt; 增加用户组</td>
+      </tr>
+      <tr>
+        <td align="center">
+          <table width="98%" cellspacing="0" cellpadding="0" class="table table-borderless">
+            <tr>
+              <td width="10%" height="26">组名称：</td>
+              <td width="90%" style="text-align:left"><input name="groupname" type="text" id="groupname"></td>
+            </tr>
+            <tr>
+              <td width="10%" height="26">级别值：</td>
+              <td width="90%" style="text-align:left"><input name="rankid" type="text" id="rankid" size="6">（数字，系统已占用的级别值：
+                <?php $dsql->SetQuery("Select `rank` From `#@__admintype`");$dsql->Execute();while($row = $dsql->GetObject()) echo '<span style=\'color:#e74d58\'>'.$row->rank.'</span>'; ?>，级别值必须小于10，超过或等于10所有权限设置将无效(超级管理员)，如果10个组不能完全满足您的要求，允许使用小数）</td>
+            </tr>
             <?php
-         $l = 0;
-         $dsql->SetQuery('Select plusname From #@__plus');
-         $dsql->Execute();
-         while($row=$dsql->GetObject()){
-         	 echo " <label><input name='purviews[]' type='checkbox' class='np' id='purviews$k' value='plus_{$row->plusname}'> {$row->plusname}</label>";
-        	 $k++;
-        	 $l++;
-        	 if($l%6==0) echo "<br>";
-         }
-         ?>
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center" class="py-3">
-            <button type="submit" class="btn btn-success btn-sm" onClick="DoSubmit('gettag')" class="coolbg np">保存</button>
-          </td>
-        </tr>
-    </table>
-    </td>
-    </tr>
+            $start = 0;
+            $k = 0;
+            $gouplists = file(dirname(__FILE__).'/../inc/grouplist.txt');
+            foreach($gouplists as $line)
+            {
+            	$line = trim($line);
+            	if($line=="") continue;
+            	if(preg_match("#^>>#", $line))
+            	{
+            		if($start>0) echo "</td></tr>";
+            		$start++;
+            		$lhead = "
+            	 <tr> 
+               <td height='26' colspan='2'>{$start}、".str_replace('>>','',$line)."</td></tr>
+               <tr><td height='26' colspan='2'>
+            		"; 
+            		echo $lhead;
+            	}
+            	else if(preg_match("#^>#", $line))
+            	{
+            		$ls = explode('>',$line);
+            		$tag = $ls[1];
+            		$tagname = str_replace('[br]', '<br>', $ls[2]);
+            		if(!preg_match("#<br \/>#", $tagname) ) $tagname .= "<span>($tag)</span>";
+            		else $tagname = str_replace('<br>', "<span>($tag)</span><br>", $tagname);
+            		echo " <label><input name='purviews[]' type='checkbox' class='np' id='purviews$k' value='$tag'> $tagname</label> ";
+            	  $k++;
+            	}
+            }
+            $start++;
+            ?>
+            <tr>
+              <td height="26" colspan="2"><?php echo $start?>、插件权限</td>
+            </tr>
+            <tr>
+              <td height="26" colspan="2">
+              <?php
+              $l = 0;
+              $dsql->SetQuery('Select plusname From #@__plus');
+              $dsql->Execute();
+              while($row=$dsql->GetObject()){
+               	echo " <label><input name='purviews[]' type='checkbox' class='np' id='purviews$k' value='plus_{$row->plusname}'> {$row->plusname}</label> ";
+              	$k++;
+              	$l++;
+              	if($l%6==0) echo "<br>";
+              }
+              ?>
+              </td>
+            </tr>
+            <tr>
+              <td colspan="2" align="center" class="py-3">
+                <button type="submit" class="btn btn-success btn-sm" onClick="DoSubmit('gettag')" class="coolbg np">保存</button>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
     </form>
-    </table>
+  </table>
 </body>
 </html>

src/admin/templets/sys_group_edit.htm

@@ -20,76 +20,73 @@
           <td align="center">
             <table width="98%" cellspacing="0" cellpadding="0" class="table table-borderless">
               <tr>
-                <td width="9%" height="26">组名称：</td>
-                <td width="91%" style="text-align:left"><input name="typename" type="text" id="typename" value="<?php echo $groupSet['typename']?>" style="width:260px">
-                </td>
+                <td width="10%" height="26">组名称：</td>
+                <td width="90%"><input name="typename" type="text" id="typename" value="<?php echo $groupSet['typename']?>" style="width:260px"></td>
               </tr>
               <tr>
-                <td width="9%" height="26">级别值：</td>
-                <td width="91%" style="text-align:left">
+                <td width="10%" height="26">级别值：</td>
+                <td width="90%">
                   <input name="rank" type="hidden" id="rank" value="<?php echo $groupSet['rank']?>">
                   <?php echo $groupSet['rank']?>
                 </td>
               </tr>
               <?php
-        $start = 0;
-        $k = 0;
-        $gouplists = file(DEDEADMIN.'/inc/grouplist.txt');
-        foreach($gouplists as $line)
-        {
-        	$line = trim($line);
-        	if($line=="") continue;
-        	if(preg_match("#^>>#", $line))
-        	{
-        		if($start>0) echo "</td></tr>";
-        		$start++;
-        		$lhead = "
-        	 <tr> 
-           <td height='26' colspan='2' bgcolor='#F9FAF3' style='text-align:left'>{$start}、".str_replace('>>','',$line)."</td></tr>
-           <tr><td height='26' colspan='2' style='text-align:left'>
-        		"; 
-        		echo $lhead;
-        	}
-        	else if(preg_match("#^>#", $line))
-        	{
-        		$ls = explode('>',$line);
-        		$tag = $ls[1];
-        		$tagname = str_replace('[br]','<br>',$ls[2]);
-        		if(!preg_match("#<br>#", $tagname) ) $tagname .= "<span>($tag)</span>";
-        		else $tagname = str_replace('<br>', "<span>($tag)</span><br>", $tagname);
-        		echo "<label><input name='purviews[]' type='checkbox' class='np' id='purviews$k' value='$tag'".CRank($tag)."> $tagname</label>";
-        	  $k++;
-        	}
-        }
-        $start++;
-        ?>
-          </td>
-        </tr>
-        <tr>
-          <td height='26' colspan='2' bgcolor='#F9FAF3' style="text-align:left"><?php echo $start?>、插件权限</td>
-        </tr>
-        <tr>
-          <td height='26' colspan='2' style="text-align:left">
-            <?php
-         $l = 0;
-         $dsql->SetQuery('SELECT plusname FROM #@__plus');
-         $dsql->Execute();
-         while($row=$dsql->GetObject()){
-         	 echo " <label></label><input name='purviews[]' type='checkbox' class='np' id='purviews$k' value='plus_{$row->plusname}'".CRank("plus_{$row->plusname}")."> {$row->plusname}</label>";
-        	 $k++;
-        	 $l++;
-        	 if($l % 6 == 0) echo "<br>";
-         }
-         ?>
+              $start = 0;
+              $k = 0;
+              $gouplists = file(DEDEADMIN.'/inc/grouplist.txt');
+              foreach($gouplists as $line)
+              {
+              	$line = trim($line);
+              	if($line=="") continue;
+              	if(preg_match("#^>>#", $line))
+              	{
+              		if($start>0) echo "</td></tr>";
+              		$start++;
+              		$lhead = "
+              	 <tr> 
+                 <td height='26' colspan='2'>{$start}、".str_replace('>>','',$line)."</td></tr>
+                 <tr><td height='26' colspan='2'>
+              		"; 
+              		echo $lhead;
+              	}
+              	else if(preg_match("#^>#", $line))
+              	{
+              		$ls = explode('>',$line);
+              		$tag = $ls[1];
+              		$tagname = str_replace('[br]','<br>',$ls[2]);
+              		if(!preg_match("#<br>#", $tagname) ) $tagname .= "<span>($tag)</span>";
+              		else $tagname = str_replace('<br>', "<span>($tag)</span><br>", $tagname);
+              		echo " <label><input name='purviews[]' type='checkbox' class='np' id='purviews$k' value='$tag'".CRank($tag)."> $tagname</label> ";
+              	  $k++;
+              	}
+              }
+              $start++;
+              ?>
+              <tr>
+                <td height="26" colspan="2"><?php echo $start?>、插件权限</td>
+              </tr>
+              <tr>
+                <td height="26" colspan="2">
+                  <?php
+                  $l = 0;
+                  $dsql->SetQuery('SELECT plusname FROM #@__plus');
+                  $dsql->Execute();
+                  while($row=$dsql->GetObject()){
+                   	echo " <label><input name='purviews[]' type='checkbox' class='np' id='purviews$k' value='plus_{$row->plusname}'".CRank("plus_{$row->plusname}")."> {$row->plusname}</label> ";
+                  	$k++;
+                  	$l++;
+                  	if($l % 6 == 0) echo "<br>";
+                  }
+                  ?>
+                </td>
+              </tr>
+              <tr>
+                <td colspan="2" align="center" class="py-3"><button type="submit" class="btn btn-success btn-sm" class="coolbg np">保存</button></td>
+              </tr>
+            </table>
           </td>
         </tr>
-        <tr>
-          <td colspan="2" align="center" class="py-3"><button type="submit" class="btn btn-success btn-sm" class="coolbg np">保存</button></td>
-        </tr>
-    </table>
-    </td>
-    </tr>
-    </form>
+      </form>
     </table>
   </center>
 </body>

src/admin/templets/tpl_edit.htm

@@ -112,7 +112,6 @@
 				<tr>
 					<td bgcolor="#f8f8f8" colspan="2" align="center" class="py-3">
 						<button type="submit" name="B1" class="btn btn-success btn-sm">保存</button>
-						<button type="reset" name="B2" class="btn btn-success btn-sm">重置</button>
 						<button type="button" name="B4" class="btn btn-success btn-sm" onClick="javascript:history.go(-1);">返回</button>
 					</td>
 				</tr>

src/admin/templets/tpl_edit_tag.htm

@@ -75,7 +75,6 @@
 				<tr>
 					<td bgcolor="#f8f8f8" colspan="2" class="py-3">
 						<button type="submit" name="B1" class="btn btn-success btn-sm">保存</button>
-						<button type="reset" name="B2" class="btn btn-success btn-sm">重置</button>
 						<button type="button" name="B4" class="btn btn-success btn-sm" onClick="javascript:history.go(-1);">返回</button>
 					</td>
 				</tr>

src/system/libraries/oxwindow.class.php

@@ -192,7 +192,6 @@ class OxWindow
 <tr>
 <td align='center' colspan='2' class='py-3'>
 <button type='submit' class='btn btn-success btn-sm'>$tt</button>
-<button type='button' class='btn btn-success btn-sm' onClick='this.form.reset();return false;'>重置</button>
 <button type='button' class='btn btn-success btn-sm' onClick='history.go(-1);'>返回</button>
 </td>
 </tr>";

src/theme/plus/car.htm

@@ -3,19 +3,19 @@
 	<head>
 		<meta charset="{dede:global name='cfg_soft_lang'/}">
 		<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
-		<title>购物车-{dede:var.carts.orders_id/}订单号</title>
+		<title>订单号{dede:var.carts.orders_id/}-购物车-<?php echo $cfg_webname; ?></title>
 		<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/web/font/css/font-awesome.min.css">
 		<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/web/css/style.css">
 		<script src="{dede:global.cfg_cmsurl/}/static/web/js/jquery.min.js"></script>
 	</head>
 	<body class="buycarpage">
-		<?php include(DEDETEMPLATE."/plus/plus_header.htm") ;?>
+		<?php include(DEDETEMPLATE."/plus/plus_header.htm"); ?>
 		<div class="container">
 			<div class="sp-title">
 				<h2>购物车</h2>
 			</div>
-			<div id="errorChickCookie" class="clear center mt1" style="font-style:inherit;color:#424b51;font-weight:normal;padding-top:8px;padding-bottom:8px;text-align:center;">
+			<div id="errorChickCookie" class="clear center mt1" style="font-style:inherit;color:#424b51;font-weight:normal;padding:10px 0;text-align:center">
 			</div>
 			<div class="buycar">
 				<h3>我的购物车 - <em id="carId">{dede:var.carts.orders_id/}</em>订单号</h3>
@@ -117,7 +117,7 @@
 				}
 			}
 		</script>
-		<?php include(DEDETEMPLATE."/plus/plus_footer.htm") ;?>
+		<?php include(DEDETEMPLATE."/plus/plus_footer.htm"); ?>
 		<script>
 			if (!navigator.cookieEnabled) {
 				$('#errorChickCookie').html('您浏览器的 cookie 功能被禁用，请启用此功能');

src/theme/plus/carbuyaction.htm

@@ -3,14 +3,14 @@
 	<head>
 		<meta charset="{dede:global name='cfg_soft_lang'/}">
 		<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
-		<title>购物车-下单购买{dede:var.carts.orders_id/}</title>
+		<title>下单购买{dede:var.carts.orders_id/}-购物车-<?php echo $cfg_webname; ?></title>
 		<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/web/font/css/font-awesome.min.css">
 		<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/web/css/style.css">
 		<script src="{dede:global.cfg_cmsurl/}/static/web/js/jquery.min.js"></script>
 	</head>
 	<body class="buycarpage">
-		<?php include(DEDETEMPLATE."/plus/plus_header.htm") ;?>
+		<?php include(DEDETEMPLATE."/plus/plus_header.htm"); ?>
 		<div class="container">
 			<div class="sp-title">
 				<h3>商品购买</h3>
@@ -19,7 +19,7 @@
 				<?php if(!$cfg_ml->IsLogin()){ ?>
 				<table cellpadding="0" cellspacing="0" class="table">
 					<tr>
-						<td style="color:#F00">您好，欢迎来到本网站，请 <a href="../user/login.php?gourl=<?php echo urlencode(GetCurUrl());?>">登录</a> 或 <a href="../user/index_do.php?fmdo=user&dopost=regnew">注册</a></td>
+						<td style="color:#F00">欢迎来到本网站，请 <a href="../user/login.php?gourl=<?php echo urlencode(GetCurUrl());?>">登录</a> 或 <a href="../user/index_do.php?fmdo=user&dopost=regnew">注册</a></td>
 					</tr>
 				</table>
 				<?php } ?>
@@ -179,6 +179,6 @@
 				document.getElementById("vdimgck_img").src = '../apps/vdimgck.php?' + Math.random();
 			}
 		</script>
-		<?php include(DEDETEMPLATE."/plus/plus_footer.htm") ;?>
+		<?php include(DEDETEMPLATE."/plus/plus_footer.htm"); ?>
 	</body>
 </html>

src/theme/plus/download_links_templet.htm

@@ -3,8 +3,7 @@
 	<head>
 		<meta charset="{dede:global name='cfg_soft_lang'/}">
 		<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
-		<title><?php echo $title; ?>-下载地址列表-<?php echo $cfg_webname;?></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<title><?php echo $title; ?>-下载地址列表-<?php echo $cfg_webname; ?></title>
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/font/css/font-awesome.min.css">
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/css/style.css">
@@ -19,7 +18,7 @@
 		<?php include("plus_header.htm") ; ?>
 		<div class="container">
 			<div class="sp-title">
-				<h2>软件名称：<a href='<?php echo $arcurl; ?>'><?php echo $title; ?></a></h2>
+				<h2>文件：<a href="<?php echo $arcurl; ?>"><?php echo $title; ?></a></h2>
 			</div>
 			<div class="formbox">
 				<table width="100%" align="center" cellspacing="2" class="table">

src/theme/plus/flink-add.htm

@@ -3,9 +3,7 @@
 	<head>
 		<meta charset="{dede:global name='cfg_soft_lang'/}">
 		<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
-		<meta name="viewport" content="width=device-width, initial-scale=1">
-		<title><?php echo $cfg_webname;?>-申请友情链接</title>
-		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<title>申请友链-<?php echo $cfg_webname; ?></title>
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/font/css/font-awesome.min.css">
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/css/style.css">

src/theme/plus/flink-list.htm

@@ -3,8 +3,7 @@
 	<head>
 		<meta charset="{dede:global name='cfg_soft_lang'/}">
 		<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
-		<title><?php echo $cfg_webname;?>-所有链接</title>
-		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<title>所有友链-<?php echo $cfg_webname; ?></title>
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/font/css/font-awesome.min.css">
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/css/style.css">

src/theme/plus/heightsearch.htm

@@ -3,8 +3,7 @@
 	<head>
 		<meta charset="{dede:global name='cfg_soft_lang'/}">
 		<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
-		<title><?php echo $cfg_webname;?>-高级搜索</title>
-		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<title>高级搜索-<?php echo $cfg_webname; ?></title>
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/font/css/font-awesome.min.css">
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/css/style.css">
@@ -78,10 +77,8 @@
 						<tr>
 							<td height="26" align="center">关键词模式：</td>
 							<td height="26">
-								<label><input name="kwtype" type="radio" value="1" checked>
-									或</label>
-								<label><input type="radio" name="kwtype" value="0">
-									与</label>
+								<label><input name="kwtype" type="radio" value="1" checked> 或</label>
+								<label><input type="radio" name="kwtype" value="0"> 与</label>
 							</td>
 						</tr>
 						<tr>

src/theme/plus/list_diyform.htm

@@ -3,8 +3,7 @@
 	<head>
 		<meta charset="{dede:global name='cfg_soft_lang'/}">
 		<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
-		<title><?php echo $diy->name; ?>-Powered by DedeBIZ</title>
-		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<title><?php echo $diy->name; ?>-<?php echo $cfg_webname; ?></title>
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/font/css/font-awesome.min.css">
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/css/style.css">
@@ -12,7 +11,7 @@
 	</head>
 	<body>
 		<div class="main mceneter">
-			<?php include(DEDETEMPLATE."/plus/plus_header.htm") ;?>
+			<?php include(DEDETEMPLATE."/plus/plus_header.htm"); ?>
 			<div class="container">
 				<div class="ctitle">
 					<nav class="navbar navbar-expand-lg">
@@ -21,13 +20,13 @@
 								<h3><?php echo $diy->name; ?>内容列表</h3>
 							</li>
 						</ul>
-						<span class="navbar-text"><a href="diy.php?action=post&diyid=<?php echo $diy->diyid;?>" class="btn btn-success btn-sm">发布信息</a></span>
+						<span class="navbar-text"><a href="diy.php?action=post&diyid=<?php echo $diy->diyid; ?>" class="btn btn-success btn-sm">发布信息</a></span>
 					</nav>
 				</div>
 				<div class="cbox mceneter">
 					<div class="maplist">
 						{dede:datalist}
-						<table class='table' cellspacing="1">
+						<table class="table" cellspacing="1">
 							<?php
 							if(!empty($fields))
 							{
@@ -70,6 +69,6 @@
 				</div>
 			</div>
 		</div>
-		<?php include(DEDETEMPLATE."/plus/plus_footer.htm") ;?>
+		<?php include(DEDETEMPLATE."/plus/plus_footer.htm"); ?>
 	</body>
 </html>

src/theme/plus/plus_footer.htm

@@ -1,7 +1,7 @@
 <footer class="bg-success mt-3">
     <div class="copyright py-5">
         <p class="text-center">
-            {dede:global.cfg_powerby/} {dede:global.cfg_beian/} Powered by <a href="https://www.dedebiz.com" title="DedeBIZ内容管理系统-国内流行的内容管理系统多端全媒体解决方案" target="_blank">DedeBIZ{dede:global.cfg_version/}</a>
+            <?php echo $cfg_powerby; ?> <?php echo $cfg_beian; ?> Powered by <a href="https://www.dedebiz.com" title="DedeBIZ内容管理系统-国内流行的内容管理系统多端全媒体解决方案" target="_blank">DedeBIZ<?php echo $cfg_version; ?></a>
         </p>
     </div>
 </footer>

src/theme/plus/post_diyform.htm

@@ -3,8 +3,7 @@
 	<head>
 		<meta charset="{dede:global name='cfg_soft_lang'/}">
 		<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
-		<title><?php echo $diy->name;?>-Powered by DedeBIZ</title>
-		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<title><?php echo $diy->name;?>-<?php echo $cfg_webname; ?></title>
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/font/css/font-awesome.min.css">
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/css/style.css">
@@ -12,15 +11,14 @@
 	</head>
 	<body>
 		<div class="main mceneter">
-			<?php include(DEDETEMPLATE."/plus/plus_header.htm") ;?>
+			<?php include(DEDETEMPLATE."/plus/plus_header.htm"); ?>
 			<div class="container">
 				<div class="ctitle">
-					<h3><?php echo $diy->name;?>发布</h3>
+					<h3><?php echo $diy->name; ?>发布</h3>
 				</div>
 				<div class="cbox mceneter">
 					<div class="maplist">
-						<form action="<?php echo $cfg_cmspath;?>/apps/diy.php" enctype="multipart/form-data"
-							method="post">
+						<form action="<?php echo $cfg_cmspath;?>/apps/diy.php" enctype="multipart/form-data" method="post">
 							<input type="hidden" name="action" value="post">
 							<input type="hidden" name="diyid" value="<?php echo $diyid;?>">
 							<input type="hidden" name="do" value="2">
@@ -38,6 +36,6 @@
 				</div>
 			</div>
 		</div>
-		<?php include(DEDETEMPLATE."/plus/plus_footer.htm") ;?>
+		<?php include(DEDETEMPLATE."/plus/plus_footer.htm"); ?>
 	</body>
 </html>

src/theme/plus/qrcode.htm

@@ -12,29 +12,27 @@
 				padding: 10px;
 				width: 240px;
 				height: 300px;
-				background: #fff;
 				font-size: 12px;
+				background: #fff;
 			}
 			.dede_weixin_popup .dede_weixin_popup_head {
-				font-size: 12px;
-				font-weight: bold;
-				text-align: left;
-				line-height: 16px;
-				height: 16px;
 				position: relative;
+				height: 16px;
+				line-height: 16px;
+				font-size: 12px;
 				color: #000;
+				text-align: left;
 			}
 			.dede_weixin_popup .dede_weixin_popup_foot {
-				font-size: 12px;
-				text-align: left;
 				line-height: 22px;
+				font-size: 12px;
 				color: #666;
 				text-align: center;
 			}
 		</style>
 	</head>
 	<body>
-		<div id="dede_weixin_qrcode_dialog" class="dede_weixin_popup" style="width: 240px; height: 300px;">
+		<div id="dede_weixin_qrcode_dialog" class="dede_weixin_popup" style="width:240px;height:300px">
 			<div class="dede_weixin_popup_head"><span>分享到微信朋友圈</span>
 			</div>
 			<div id="dede_weixin_qrcode_dialog_qr" class="dede_weixin_popup_main">

src/theme/plus/recommend.htm

@@ -3,8 +3,7 @@
 	<head>
 		<meta charset="{dede:global name='cfg_soft_lang'/}">
 		<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
-		<title>推荐<?php echo $title; ?>-{dede:global name='cfg_webname'/}</title>
-		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<title>推荐<?php echo $title; ?>-<?php echo $cfg_webname; ?></title>
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/font/css/font-awesome.min.css">
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/css/style.css">

src/theme/plus/shops_action_payment.htm

@@ -3,15 +3,14 @@
 	<head>
 		<meta charset="{dede:global name='cfg_soft_lang'/}">
 		<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
-		<title>下单购买-{dede:var.carts.orders_id/}</title>
-		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<title>下单购买{dede:var.carts.orders_id/}-<?php echo $cfg_webname; ?></title>
 		<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/web/font/css/font-awesome.min.css">
 		<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/web/css/style.css">
 		<script src="{dede:global.cfg_cmsurl/}/static/web/js/jquery.min.js"></script>
 	</head>
 	<body class="buycarpage">
-		<?php include(DEDETEMPLATE."/plus/plus_header.htm") ;?>
+		<?php include(DEDETEMPLATE."/plus/plus_header.htm"); ?>
 		<div class="container">
 			<div class="sp-title">
 				<h3>商品购买</h3>
@@ -67,6 +66,6 @@
 				</table>
 			</div>
 		</div>
-		<?php include(DEDETEMPLATE."/plus/plus_footer.htm") ;?>
+		<?php include(DEDETEMPLATE."/plus/plus_footer.htm"); ?>
 	</body>
 </html>

src/theme/plus/showphoto.htm

@@ -3,8 +3,8 @@
 	<head>
 		<meta charset="{dede:global name='cfg_soft_lang'/}">
 		<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
-		<title><?php echo $arctitle; ?></title>
-		<link href="<?php echo $cfg_templets_skin; ?>/style/search.css" rel="stylesheet" media="screen">
+		<title><?php echo $arctitle; ?>-<?php echo $cfg_webname; ?></title>
+		<link rel="stylesheet" href="<?php echo $cfg_templets_skin; ?>/style/search.css">
 	</head>
 	<body>
 		<div class="header">
@@ -18,10 +18,8 @@
 		<table width="100%" cellpadding="2" cellspacing="1">
 			<tr>
 				<td align="center">
-					<a href="<?php echo $nextlink; ?>">
-						<img src="<?php echo $src?>">
-					</a>
-					<div style="line-height:32px">
+					<a href="<?php echo $nextlink; ?>"><img src="<?php echo $src?>"></a>
+					<div style="line-height:30px">
 						<a href="<?php echo $src; ?>" target="_blank">[查看原图]</a>
 					</div>
 					<div style="line-height:32px;border-top:1px dashed #BED6A7">

src/theme/plus/view_diyform.htm

@@ -3,8 +3,7 @@
 	<head>
 		<meta charset="{dede:global name='cfg_soft_lang'/}">
 		<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
-		<title><?php echo $diy->name;?>-Powered by DedeBIZ</title>
-		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<title><?php echo $diy->name; ?>-<?php echo $cfg_webname; ?></title>
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/font/css/font-awesome.min.css">
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/css/style.css">
@@ -12,14 +11,13 @@
 	</head>
 	<body>
 		<div class="main mceneter">
-			<?php include(DEDETEMPLATE."/plus/plus_header.htm") ;?>
+			<?php include(DEDETEMPLATE."/plus/plus_header.htm"); ?>
 			<div class="container">
 				<div class="ctitle">
 					<h3><?php echo $diy->name;?>详细内容</h3>
 				</div>
 				<div class="cbox mceneter">
 					<div class="maplist">
-						<br>
 						<table cellspacing="1" class="table">
 							<?php
 							echo '<tbody>';
@@ -50,6 +48,6 @@
 				</div>
 			</div>
 		</div>
-		<?php include(DEDETEMPLATE."/plus/plus_footer.htm") ;?>
+		<?php include(DEDETEMPLATE."/plus/plus_footer.htm"); ?>
 	</body>
 </html>

src/theme/plus/view_msg.htm

@@ -3,8 +3,7 @@
 	<head>
 		<meta charset="{dede:global name='cfg_soft_lang'/}">
 		<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
-		<title><?php echo $msgtitle; ?></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<title><?php echo $msgtitle; ?>-<?php echo $cfg_webname; ?></title>
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/font/css/font-awesome.min.css">
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/css/style.css">

src/theme/plus/view_msg_catalog.htm

@@ -3,7 +3,7 @@
 	<head>
 		<meta charset="{dede:global name='cfg_soft_lang'/}">
 		<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
-		<title><?php echo $msgtitle; ?></title>
+		<title><?php echo $msgtitle; ?>-<?php echo $cfg_webname; ?></title>
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/font/css/font-awesome.min.css">
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/css/style.css">
@@ -48,7 +48,7 @@
 			<div class="footer_body">
 				<span class="gotop"><a href="javascript:scroll(0,0)"><img src="<?php echo $cfg_templets_skin; ?>/images/top.gif"></a></span>
 				<p class="powered">
-					{dede:global.cfg_powerby/} {dede:global.cfg_beian/} Powered by <a href="https://www.dedebiz.com" title="DedeBIZ内容管理系统-国内流行的内容管理系统多端全媒体解决方案" target="_blank">DedeBIZ{dede:global.cfg_version/}</a>
+					<?php echo $cfg_powerby; ?> <?php echo $cfg_beian; ?> Powered by <a href="https://www.dedebiz.com" title="DedeBIZ内容管理系统-国内流行的内容管理系统多端全媒体解决方案" target="_blank">DedeBIZ<?php echo $cfg_version; ?></a>
 				</p>
 			</div>
 		</div>

src/theme/plus/vote.htm

@@ -3,22 +3,21 @@
 	<head>
 		<meta charset="{dede:global name='cfg_soft_lang'/}">
 		<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
-		<title><?php echo $cfg_webname?>-投票结果</title>
-		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<title>投票结果-<?php echo $cfg_webname; ?></title>
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/font/css/font-awesome.min.css">
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/css/style.css">
 		<script src="<?php echo $cfg_cmsurl; ?>/static/web/js/jquery.min.js"></script>
 	</head>
 	<body class="flinkpage">
-		<?php include("plus_header.htm") ; ?>
+		<?php include("plus_header.htm"); ?>
 		<div class="container">
 			<div class="sp-title">
 				<h3><?php echo $voname?></h3>
 				<p>
 					<span class="more">
-						投票开始时间：<?php echo $starttime;?>　
-						投票结束时间:<?php echo $endtime;?>
+						投票开始时间：<?php echo $starttime;?><br>
+						投票结束时间:<?php echo $endtime;?><br>
 						投票人数：<?php echo $totalcount;?>
 					</span>
 				</p>
@@ -30,6 +29,6 @@
 				<?php echo $votelist; ?>
 			</div>
 		</div>
-		<?php include("plus_footer.htm") ; ?>
+		<?php include("plus_footer.htm"); ?>
 	</body>
 </html>

src/theme/templets/googlemap.htm

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="{dede:global.cfg_soft_lang/}" ?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-{dede:freelist/}
-</urlset>

src/theme/templets/index.htm

@@ -17,52 +17,50 @@
 		{dede:include filename='header.htm'/}
 		{dede:include filename='navbar.htm'/}
 		<main class="container mt-3">
-			<div class="index-main">
-				<div class="col-12">
-					<div class="row">
-						<div class="col-12 col-lg-8 litpics mb-3">
-							<div class="row">
-								<div id="carouselIndex" class="carousel slide" data-ride="carousel">
-									<ol class="carousel-indicators">
-										{dede:arclist channelid='1' flag='f' row='6'}
-										<li data-target="#carouselIndex" data-slide-to="[field:global.autoindex function='trim(IndexSub(@me,1))'/]" class="[field:global.autoindex function='IndexActive(@me)'/]"></li>
-										{/dede:arclist}
-									</ol>
-									<div class="carousel-inner">
-										{dede:arclist channelid='1' flag='f' row='6'}
-										<div class="carousel-item[field:global.autoindex function='IndexActive(@me)'/]">
-											<a href="[field:arcurl/]" title="[field:fulltitle/]"><img src="[field:litpic/]" class="mr-3" alt="[field:fulltitle/]"></a>
-										</div>
-										{/dede:arclist}
+			<div class="col-12">
+				<div class="row">
+					<div class="col-12 col-lg-8 litpics mb-3">
+						<div class="row">
+							<div id="carouselIndex" class="col-12 carousel slide" data-ride="carousel">
+								<ol class="carousel-indicators">
+									{dede:arclist channelid='1' flag='f' row='6'}
+									<li data-target="#carouselIndex" data-slide-to="[field:global.autoindex function='trim(IndexSub(@me,1))'/]" class="[field:global.autoindex function='IndexActive(@me)'/]"></li>
+									{/dede:arclist}
+								</ol>
+								<div class="carousel-inner">
+									{dede:arclist channelid='1' flag='f' row='6'}
+									<div class="carousel-item[field:global.autoindex function='IndexActive(@me)'/]">
+										<a href="[field:arcurl/]" title="[field:fulltitle/]"><img src="[field:litpic/]" class="mr-3" alt="[field:fulltitle/]"></a>
 									</div>
-									<a class="carousel-control-prev" href="#carouselIndex" role="button" data-slide="prev">
-										<span class="carousel-control-prev-icon"></span>
-										<span class="sr-only">上一个</span>
-									</a>
-									<a class="carousel-control-next" href="#carouselIndex" role="button" data-slide="next">
-										<span class="carousel-control-next-icon"></span>
-										<span class="sr-only">下一个</span>
-									</a>
+									{/dede:arclist}
 								</div>
+								<a class="carousel-control-prev" href="#carouselIndex" role="button" data-slide="prev">
+									<span class="carousel-control-prev-icon"></span>
+									<span class="sr-only">上一个</span>
+								</a>
+								<a class="carousel-control-next" href="#carouselIndex" role="button" data-slide="next">
+									<span class="carousel-control-next-icon"></span>
+									<span class="sr-only">下一个</span>
+								</a>
 							</div>
 						</div>
-						<div class="col-12 col-lg-4 toutiao mb-3 mb-md-3">
-							<div class="row">
-								<div class="card ddcard-normal">
-									<div class="card-header">
-										<div class="row">
-											<div class="col-8 caption"><span>推荐头条</span></div>
-										</div>
+					</div>
+					<div class="col-12 col-lg-4 toutiao mb-3 mb-md-3">
+						<div class="row">
+							<div class="col-12 card ddcard-normal">
+								<div class="card-header">
+									<div class="row">
+										<div class="col-8 caption"><span>推荐头条</span></div>
 									</div>
-									<ul class="list-group list-group-flush">
-										{dede:arclist flag='h' titlelen='100' row='7' orderby='pubdate'}
-										<li>
-											<i class="fa fa-bookmark-o"></i>
-											<a title="[field:fulltitle/]" href="[field:arcurl/]">[field:title/]</a>
-										</li>
-										{/dede:arclist}
-									</ul>
 								</div>
+								<ul class="list-group list-group-flush">
+									{dede:arclist flag='h' titlelen='100' row='7' orderby='pubdate'}
+									<li>
+										<i class="fa fa-bookmark-o"></i>
+										<a title="[field:fulltitle/]" href="[field:arcurl/]">[field:title/]</a>
+									</li>
+									{/dede:arclist}
+								</ul>
 							</div>
 						</div>
 					</div>