关键词管理调整

src/admin/article_keywords_select.php

@@ -22,12 +22,12 @@ $dlist->SetSource($sql);
 $dlist->Display();
 function GetSta($sta)
 {
-    if ($sta == 1) return "正常";
-    else return "<span class='text-danger'>禁用</span>";
+    if ($sta == 1) return " <span class='btn btn-outline-success btn-sm'>正常</span>";
+    else return " <span class='btn btn-outline-danger btn-sm'>禁用</span>";
 }
 function GetMan($sta)
 {
-    if ($sta == 1) return "禁用";
-    else return "启用";
+    if ($sta == 1) return " <span class='btn btn-outline-danger btn-sm'>禁用</span>";
+    else return " <span class='btn btn-outline-success btn-sm'>启用</span>";
 }
 ?>

src/admin/content_list.php

@@ -84,7 +84,7 @@ if ($cid == 0) {
 } else {
     $positionname = str_replace($cfg_list_symbol, " > ", $tl->GetPositionName())." > ";
 }
-//当选择的是单表模型栏目时，直接跳转到单表模型管理区
+//当选择的是单表模型栏目时，直接跳转单表模型管理区
 if (
     empty($channelid)
     && isset($tl->TypeInfos['channeltype'])

src/admin/mychannel_edit.php

@@ -252,7 +252,7 @@ else if ($dopost == "copysave") {
     }
     $rs = $dsql->ExecuteNoneQuery($inquery);
     if ($rs) {
-        ShowMsg("成功复制模型，现转到详细参数页 ", "mychannel_edit.php?id={$newid}&dopost=edit");
+        ShowMsg("成功复制模型，现跳转详细参数页 ", "mychannel_edit.php?id={$newid}&dopost=edit");
         exit();
     } else {
         $errv = $dsql->GetError();

src/admin/plus_edit.php

@@ -13,11 +13,11 @@ CheckPurview('sys_plus');
 $aid = preg_replace("#[^0-9]#", "", $aid);
 if ($dopost == "show") {
     $dsql->ExecuteNoneQuery("UPDATE `#@__plus` SET isshow=1 WHERE aid='$aid';");
-    ShowMsg("成功启用一个插件，请刷新导航菜单", "plus_main.php");
+    ShowMsg("启用一个插件，请刷侧边导航", "plus_main.php");
     exit();
 } else if ($dopost == "hide") {
     $dsql->ExecuteNoneQuery("UPDATE `#@__plus` SET isshow=0 WHERE aid='$aid';");
-    ShowMsg("成功禁用一个插件，请刷新导航菜单", "plus_main.php");
+    ShowMsg("禁用一个插件，请刷侧边导航", "plus_main.php");
     exit();
 } else if ($dopost == "delete") {
     if (empty($job)) $job = "";
@@ -32,21 +32,21 @@ if ($dopost == "show") {
         $win->AddHidden("dopost", $dopost);
         $win->AddHidden("aid", $aid);
         $win->AddTitle("您确定要删除<span class='text-primary'>".$title."</span>插件吗");
-        $win->AddMsgItem("警告：在这里删除仅仅删除菜单项，要干净删除请在模块管理处删除<br><br><a href='module_main.php?moduletype=plus'>模块管理&gt;</a>");
+        $win->AddMsgItem("提示：这里仅删除插件导航项，要干净删除请在模块管理处卸载删除，<a href='module_main.php?moduletype=plus'>模块管理</a>");
         $winform = $win->GetWindow("ok");
         $win->Display();
         exit();
     } else if ($job == "yes") //操作
     {
         $dsql->ExecuteNoneQuery("DELETE FROM `#@__plus` WHERE aid='$aid';");
-        ShowMsg("成功删除一个插件，请刷侧边菜单", "plus_main.php");
+        ShowMsg("删除一个插件，请刷侧边导航", "plus_main.php");
         exit();
     }
 } else if ($dopost == "saveedit") //保存修改
 {
     $inquery = "UPDATE `#@__plus` SET plusname='$plusname',menustring='$menustring',filelist='$filelist' WHERE aid='$aid';";
     $dsql->ExecuteNoneQuery($inquery);
-    ShowMsg("成功修改插件的配置", "plus_main.php");
+    ShowMsg("完成修改插件配置", "plus_main.php");
     exit();
 }
 $row = $dsql->GetOne("SELECT * FROM `#@__plus` WHERE aid='$aid'");

src/admin/sys_data_done.php

@@ -18,7 +18,7 @@ if (DEDEBIZ_SAFE_MODE) {
 CheckPurview('sys_Data');
 if (empty($dopost)) $dopost = '';
 $bkdir = DEDEDATA.'/'.$cfg_backup_dir;
-//跳转到一下页的js
+//跳转一下页的js
 $gotojs = "function GotoNextPage(){document.gonext."."submit();}"."\r\nset"."Timeout('GotoNextPage()',500);";
 $dojs = "<script>$gotojs</script>";
 /*--------------------

src/admin/task_do.php

@@ -104,7 +104,7 @@ if ($dopost == 'makeindex') {
         exit();
     } else {
         $jumpurl = GetNextUrl();
-        ShowMsg("完成主页更新 现在跳转到其它更新任务", $jumpurl, 0, 500);
+        ShowMsg("完成主页更新 现在跳转其它更新任务", $jumpurl, 0, 500);
         exit();
     }
 }

src/admin/templets/article_keywords_select.htm

@@ -26,7 +26,6 @@
 				} else {
 				  window.opener.document.<?php echo $f?>.value = document.form2.keywords.value;
 				}
-				//window.opener=true; //firefox出错
 				window.close();
 			}
 			function showHide(objname)
@@ -42,59 +41,38 @@
 		</script>
 	</head>
 	<body>
-		<div class="main">
+		<form name="form1" action="article_keywords_main.php">
+			<input type="hidden" name="dopost" value="add">
+			<table cellpadding="1" cellspacing="1" align="center" id="addnew" class="table maintable table-borderless mt-3" style="display:none">
+				<tr bgcolor="#f5f5f5">
+					<td width="380"><input type="text" name="keyword" id="keyword" placeholder="请输入关键词" class="admin-input-md"></td>
+					<td width="170"><input type="text" name="rpurl" id="rpurl" placeholder="请输入链接" class="admin-input-sm"></td>
+					<td width="170"><input type="text" name="rank" id="rank" placeholder="请输入频率" class="admin-input-sm"></td>
+					<td><input type="submit" name="Submit" value="保存" class="btn btn-success btn-sm"></td>
+				</tr>
+			</table>
+		</form>
+		<form name="form2">
 			<table cellpadding="1" cellspacing="1" align="center" class="table maintable my-3">
-				<form name="form1" action="article_keywords_main.php">
-					<input type="hidden" name="dopost" value="add">
-					<tr id="addnew" style="display:none">
-						<td align="center" class="border-top-0">
-							<table cellspacing="0" cellpadding="0" class="table table-borderless">
-								<tr>
-									<td width="380"><input type="text" name="keyword" id="keyword" placeholder="请输入关键词" class="admin-input-md"></td>
-									<td width="170"><input type="text" name="rpurl" id="rpurl" placeholder="请输入链接" class="admin-input-sm"></td>
-									<td width="170"><input type="text" name="rank" id="rank" placeholder="请输入频率" class="admin-input-sm"></td>
-									<td><input type="submit" name="Submit" value="保存" class="btn btn-success btn-sm"></td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-				</form>
-				<form name="form2">
-					<tr>
-						<td bgcolor="#f5f5f5">
-							<table cellpadding="0" cellspacing="0" class="table table-borderless w-100">
-								<tr>
-									<td width="30%">选择关键词</td>
-									<td width="70%" align="right">
-										<button type="button" class="btn btn-success btn-sm" name="kwa" onClick="AddNewKw()">新增关键词</button>
-										<button type="button" class="btn btn-success btn-sm" name="kwm" onClick="location='article_keywords_main.php';">关键词管理</button>
-									</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-					<tr>
-						<td>
-							{dede:datalist empty='<div class="text-center py-2">暂无文档</div>'}
-							<a href="javascript:SelKw('{dede:field.keyword/}')">{dede:field.keyword/}</a>
-							{/dede:datalist}
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<table cellspacing="0" cellpadding="0" class="table table-borderless">
-								<tr>
-									<td width="270"><input type="text" name="keywords" id="keywords" value="<?php echo $keywords?>" placeholder="请输入关键词" class="admin-input-md"></td>
-									<td><button type="button" class="btn btn-success btn-sm" name="Submit" onClick="ReturnValue()">选用</button></td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-					<tr>
-						<td bgcolor="#f5f5f5" align="center" class="py-2">{dede:pagelist listsize='6'/}</td>
-					</tr>
-				</form>
+				<tr bgcolor="#f5f5f5">
+					<td width="380" align="center"><input type="text" name="keywords" id="keywords" value="<?php echo $keywords?>" placeholder="请输入关键词" class="admin-input-md"></td>
+					<td>
+						<button type="button" class="btn btn-success btn-sm" name="Submit" onClick="ReturnValue()">选用</button>
+						<button type="button" class="btn btn-success btn-sm" name="kwa" onClick="AddNewKw()">新增关键词</button>
+						<button type="button" class="btn btn-success btn-sm" name="kwm" onClick="location='article_keywords_main.php';">关键词管理</button>
+					</td>
+				</tr>
+				<tr>
+					<td colspan="2">
+						{dede:datalist empty='<div class="text-center py-2">暂无文档</div>'}
+						<a href="javascript:SelKw('{dede:field.keyword/}')" class="mr-2">{dede:field.keyword/}</a>
+						{/dede:datalist}
+					</td>
+				</tr>
+				<tr>
+					<td bgcolor="#f5f5f5" colspan="2" align="center" class="py-2">{dede:pagelist listsize='6'/}</td>
+				</tr>
 			</table>
-		</div>
+		</form>
 	</body>
 </html>

src/admin/templets/makehtml_taglist.htm

@@ -25,7 +25,7 @@
 				</tr>
 				<tr>
 					<td colspan="2">
-						<div class="alert alert-info mb-0">标签说明：生成静态文件后，访问动态文件则直接跳转到静态文件，如果需要动态访问，删除对应文件即可。标签首页模板：<?php echo $cfg_templets_dir;?>/<?php echo $cfg_df_style?>/tag.htm 标签列表页模板：<?php echo $cfg_templets_dir;?>/<?php echo $cfg_df_style?>/taglist.htm</div>
+						<div class="alert alert-info mb-0">标签说明：生成静态文件后，访问动态文件则直接跳转静态文件，如果需要动态访问，删除对应文件即可。标签首页模板：<?php echo $cfg_templets_dir;?>/<?php echo $cfg_df_style?>/tag.htm 标签列表页模板：<?php echo $cfg_templets_dir;?>/<?php echo $cfg_df_style?>/taglist.htm</div>
 					</td>
 				</tr>
 				<?php

src/apps/feedback.php

@@ -232,13 +232,13 @@ else if ($action == 'send') {
     if ($ischeck == 0) {
         echo json_encode(array(
             "code" => 200,
-            "msg" => "成功发表评论，但需审核后才会显示您的评论",
+            "msg" => "成功发表评论，审核后才会显示您的评论",
             "data" => "ok",
         ));
     } else {
         echo json_encode(array(
             "code" => 200,
-            "msg" => "成功发表评论，现在转到评论页面",
+            "msg" => "成功发表评论，现在跳转评论页面",
             "data" => "ok",
         ));
     }

src/system/libraries/dedehttpdown.class.php

@@ -117,7 +117,7 @@ class DedeHttpDown
         $this->PrivateStartSession($requestType);
     }
     /**
-     *  转到303重定向网址
+     *  跳转303重定向网址
      *
      * @access    public
      * @param     string   $url   地址

src/user/inc/inc_pwd_functions.php

@@ -89,7 +89,7 @@ function newmail($mid, $userid, $mailto, $type, $send)
                 sendmail($mailto, $mailtitle, $mailbody, $headers);
                 return ShowMsg('EMAIL修改验证码已经发送到原来的邮箱请查收', 'login.php', '', '5000');
             } else if ($send == 'N') {
-                return ShowMsg('稍后跳转到修改页', $cfg_basehost.$cfg_memberurl."/resetpassword.php?dopost=getpasswd&id=".$mid."&key=".$randval);
+                return ShowMsg('稍后跳转修改页', $cfg_basehost.$cfg_memberurl."/resetpassword.php?dopost=getpasswd&id=".$mid."&key=".$randval);
             }
         } else {
             return ShowMsg('对不起修改失败，请联系管理员', 'login.php');
@@ -102,7 +102,7 @@ function newmail($mid, $userid, $mailto, $type, $send)
                 sendmail($mailto, $mailtitle, $mailbody, $headers);
                 ShowMsg('EMAIL修改验证码已经发送到原来的邮箱请查收', 'login.php');
             } elseif ($send === 'N') {
-                return ShowMsg('稍后跳转到修改页', $cfg_basehost.$cfg_memberurl."/resetpassword.php?dopost=getpasswd&id=".$mid."&key=".$randval);
+                return ShowMsg('稍后跳转修改页', $cfg_basehost.$cfg_memberurl."/resetpassword.php?dopost=getpasswd&id=".$mid."&key=".$randval);
             }
         } else {
             ShowMsg('对不起修改失败，请与管理员联系', 'login.php');