From fe8aa9159cf350424e2e3e8ff41e629fe76e9195 Mon Sep 17 00:00:00 2001
From: tianya <tianya@imcollege.cn>
Date: Thu, 17 Sep 2020 15:25:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E5=90=8E=E5=8F=B0=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/dede/article_template_rand.php          |  6 ++--
 src/dede/catalog_edit.php                   | 33 +++++++++++----------
 src/dede/templets/archives_add.htm          |  2 +-
 src/dede/templets/article_keywords_main.htm |  1 -
 src/dede/templets/content_i_list.htm        |  1 -
 src/member/templets/edit_baseinfo.htm       | 12 ++++----
 src/member/templets/index-notlogin.htm      |  2 +-
 src/static/img/base.css                     |  2 +-
 src/templets/plus/win_templet.htm           |  1 +
 9 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/src/dede/article_template_rand.php b/src/dede/article_template_rand.php
index 4968a7d5..1af04f88 100755
--- a/src/dede/article_template_rand.php
+++ b/src/dede/article_template_rand.php
@@ -84,7 +84,7 @@ $wintitle = "随机模板防采集设置";
 $wecome_info = "随机模板防采集设置";
 make_hash();
 $msg = "
-<link href='images/base.css' rel='stylesheet' type='text/css' />
+<link href='css/base.css' rel='stylesheet' type='text/css' />
 <script language='javascript' src='js/main.js'></script>
 <script language='javascript' src='../static/js/dedeajax2.js'></script>
 <script language='javascript'>
@@ -105,8 +105,8 @@ function DoRand(jobname)
 <tr>
     <td height='28'>
     如果你想对旧的文章应用随机模板设置，请点击此对旧文章进行处理(必须设置好模板项)！
-    &nbsp; <a href='#' onclick='DoRand(\"makeold\")'>[<u>设置全部</u>]</a>
-    &nbsp; <a href='#' onclick='DoRand(\"clearold\")'>[<u>取消全部</u>]</a>
+    &nbsp; <a href='#' onclick='DoRand(\"makeold\")' class='btn btn-secondary btn-sm'>设置全部</a>
+    &nbsp; <a href='#' onclick='DoRand(\"clearold\")' class='btn btn-secondary btn-sm'>取消全部</a>
     &nbsp; <span id='tmpct' style='color:red;font-weight:bold'>$okmsg</span>
     </td>
 </tr>
diff --git a/src/dede/catalog_edit.php b/src/dede/catalog_edit.php
index 1b44bac5..6607363f 100755
--- a/src/dede/catalog_edit.php
+++ b/src/dede/catalog_edit.php
@@ -197,9 +197,11 @@ if($dopost == 'time')
           </tr>
          <tr> 
             <td width="150" class='bline' height="26" align="center">是否支持投稿：</td>
-            <td class='bline'> <input type='radio' name='issend' value='0' class='np' <?php if($myrow['issend']=="0") echo " checked='1' ";?> />
-              不支持&nbsp; <input type='radio' name='issend' value='1' class='np' <?php if($myrow['issend']=="1") echo " checked='1' ";?> />
-              支持 </td>
+            <td class='bline'> 
+              <label><input type='radio' name='issend' value='0' class='np' <?php if($myrow['issend']=="0") echo " checked='1' ";?> />
+              不支持</label>&nbsp; 
+              <label><input type='radio' name='issend' value='1' class='np' <?php if($myrow['issend']=="1") echo " checked='1' ";?> />
+              支持</label></td>
           </tr>
           <!-- 在快速修改更改内容模型后，因为模板没改变，会导致错误，因此去除些选择框。 -->
           <tr> 
@@ -246,12 +248,13 @@ if($dopost == 'time')
           </tr>
           <tr> 
             <td height="26" align="center" class='bline'>栏目列表选项：</td>
-            <td class='bline'> <input type='radio' name='isdefault' value='1' class='np'<?php if($myrow['isdefault']==1) echo " checked='1' ";?>/>
-              链接到默认页 
-              <input type='radio' name='isdefault' value='0' class='np'<?php if($myrow['isdefault']==0) echo " checked='1' ";?>/>
-              链接到列表第一页 
-              <input type='radio' name='isdefault' value='-1' class='np'<?php if($myrow['isdefault']==-1) echo " checked='1' ";?>/>
-              使用动态页 </td>
+            <td class='bline'> 
+              <label><input type='radio' name='isdefault' value='1' class='np'<?php if($myrow['isdefault']==1) echo " checked='1' ";?>/>
+              链接到默认页</label>
+              <label><input type='radio' name='isdefault' value='0' class='np'<?php if($myrow['isdefault']==0) echo " checked='1' ";?>/>
+              链接到列表第一页</label>
+              <label><input type='radio' name='isdefault' value='-1' class='np'<?php if($myrow['isdefault']==-1) echo " checked='1' ";?>/>
+              使用动态页</label> </td>
           </tr>
           <tr> 
             <td class='bline' height="26" align="center">默认页的名称： </td>
@@ -260,13 +263,13 @@ if($dopost == 'time')
           <tr> 
             <td height="26" class='bline' align="center">栏目属性：</td>
             <td class='bline'>
-                <input name="ispart" type="radio" id="radio" value="0" class='np'<?php if($myrow['ispart']==0) echo " checked='1' ";?>/>
-              最终列表栏目（允许在本栏目发布文档，并生成文档列表）<br>
-              <input name="ispart" type="radio" id="radio2" value="1" class='np'<?php if($myrow['ispart']==1) echo " checked='1' ";?>/>
+            <label><input name="ispart" type="radio" id="radio" value="0" class='np'<?php if($myrow['ispart']==0) echo " checked='1' ";?>/>
+              最终列表栏目（允许在本栏目发布文档，并生成文档列表）</label><br>
+              <label><input name="ispart" type="radio" id="radio2" value="1" class='np'<?php if($myrow['ispart']==1) echo " checked='1' ";?>/>
 
-              频道封面（栏目本身不允许发布文档）<br>
-              <input name="ispart" type="radio" id="radio3" value="2" class='np'<?php if($myrow['ispart']==2) echo " checked='1' ";?>/>
-              外部连接（在"文件保存目录"处填写网址）              </td>
+              频道封面（栏目本身不允许发布文档）</label><br>
+              <label><input name="ispart" type="radio" id="radio3" value="2" class='np'<?php if($myrow['ispart']==2) echo " checked='1' ";?>/>
+              外部连接（在"文件保存目录"处填写网址） </label>             </td>
           </tr>
           <tr>              
             <td align="center" colspan="2" height="54" bgcolor='#FAFEE0'>
diff --git a/src/dede/templets/archives_add.htm b/src/dede/templets/archives_add.htm
index e93c0b26..c2db352e 100755
--- a/src/dede/templets/archives_add.htm
+++ b/src/dede/templets/archives_add.htm
@@ -18,8 +18,8 @@
   <link href="../static/css/daterangepicker.css" rel="stylesheet">
   <script type="text/javascript" src="../static/js/moment.min.js"></script>
   <script type="text/javascript" src="../static/js/daterangepicker.js"></script>
-  <script language='javascript' src="js/main.js"></script>
   <script src="../static/js/bootstrap.bundle.js"></script>
+  <script language='javascript' src="js/main.js"></script>
   <link rel="stylesheet" href="../static/css/jquery.fileupload.css">
   <link href="../static/css/cropper.min.css" rel="stylesheet">
   <script src="../static/js/cropper.min.js"></script>
diff --git a/src/dede/templets/article_keywords_main.htm b/src/dede/templets/article_keywords_main.htm
index c66c8877..8cf4c2bb 100755
--- a/src/dede/templets/article_keywords_main.htm
+++ b/src/dede/templets/article_keywords_main.htm
@@ -8,7 +8,6 @@
   <link rel="stylesheet" href="../static/css/bootstrap.min.css">
   <link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
   <link href="css/base.css" rel="stylesheet" type="text/css">
-  <link href="div.css" rel="stylesheet" type="text/css">
   <style>
     .nnpp {
       border-bottom: 1px solid #666666;
diff --git a/src/dede/templets/content_i_list.htm b/src/dede/templets/content_i_list.htm
index fbfa5046..2ce6576b 100755
--- a/src/dede/templets/content_i_list.htm
+++ b/src/dede/templets/content_i_list.htm
@@ -9,7 +9,6 @@
 	<link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
 	<link rel="stylesheet" type="text/css" href="css/base.css">
 	<script language="javascript" src="../static/js/jquery.js"></script>
-	<script language="javascript" src="../static/js/jquery.js"></script>
 	<script language="javascript" src="../static/js/dedeajax2.js"></script>
 	<script language="javascript" src="js/ieemu.js"></script>
 	<script language="javascript" src="js/context_menu.js"></script>
diff --git a/src/member/templets/edit_baseinfo.htm b/src/member/templets/edit_baseinfo.htm
index 63b52e66..1b4506cc 100755
--- a/src/member/templets/edit_baseinfo.htm
+++ b/src/member/templets/edit_baseinfo.htm
@@ -142,15 +142,15 @@
                 <div class="form-group row">
                   <label for="iptEmail" class="col-sm-2 col-form-label">性别</label>
                   <div class="col-sm-10">
-                    <input type="radio" name="sex" value="男"
+                    <label><input type="radio" name="sex" value="男"
                       <?php if($row['sex']=='男') echo " checked='checked' "; ?> />
-                    男 &nbsp;
-                    <input type="radio" name="sex" value="女"
+                    男</label> &nbsp;
+                    <label><input type="radio" name="sex" value="女"
                       <?php if($row['sex']=='女') echo " checked='checked' "; ?> />
-                    女 &nbsp;
-                    <input type="radio" name="sex" value="保密'"
+                    女</label> &nbsp;
+                    <label><input type="radio" name="sex" value="保密'"
                       <?php if($row['sex']=='保密') echo " checked='checked' "; ?> />
-                    保密
+                    保密</label>
                   </div>
                 </div>
 
diff --git a/src/member/templets/index-notlogin.htm b/src/member/templets/index-notlogin.htm
index 7d7d366f..b30207b0 100755
--- a/src/member/templets/index-notlogin.htm
+++ b/src/member/templets/index-notlogin.htm
@@ -20,7 +20,7 @@
     <div class="container">
       <div class="login-area">
         <h4 class="text-center py-2">欢迎登录</h4>
-        <form name='form1' method='POST' action='index_do.php'>
+        <form name='form1' method='POST' action='<?php echo $cfg_memberurl;?>/index_do.php'>
           <input type="hidden" name="fmdo" value="login">
           <input type="hidden" name="dopost" value="login">
           <input type="hidden" name="keeptime" value="604800">
diff --git a/src/static/img/base.css b/src/static/img/base.css
index 2af524a1..fa28bddc 100755
--- a/src/static/img/base.css
+++ b/src/static/img/base.css
@@ -1,6 +1,6 @@
 * {font-size: 12px;line-height: 1.5;}
 body {font-size: 12px;line-height: 1.5;}
-select,textarea{vertical-align:middle;background: url(input.png) repeat-x scroll 0px 0px;}
+select,textarea{vertical-align:middle;}
 a:link { font-size: 12px; color: #000000; }
 a:visited{ font-size: 12px; color: #000000;}
 a:hover {font-size: 12px;color: red}
diff --git a/src/templets/plus/win_templet.htm b/src/templets/plus/win_templet.htm
index 72dc9162..4ebdbf77 100755
--- a/src/templets/plus/win_templet.htm
+++ b/src/templets/plus/win_templet.htm
@@ -6,6 +6,7 @@
   <link rel="stylesheet" href="{dede:global name='cfg_static_dir'/}/css/bootstrap.min.css">
   <link href="{dede:global name='cfg_static_dir'/}/font-awesome/css/font-awesome.min.css" rel="stylesheet">
   <link rel="stylesheet" type="text/css" href="{dede:global name='cfg_static_dir'/}/img/base.css">
+  <script language="javascript" src="{dede:global name='cfg_static_dir'/}/js/jquery.js"></script>
 </head>
 
 <body background='{dede:global name=' cfg_static_dir'/}/img/allbg.gif' leftmargin="8" topmargin='8'>