修复

src/admin/album_edit.php

@@ -22,7 +22,7 @@ if ($dopost != 'save') {
     $arcQuery = "SELECT ch.typename as channelname,ar.membername as rankname,arc.* FROM `#@__archives` arc LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel LEFT JOIN `#@__arcrank` ar ON ar.`rank`=arc.arcrank WHERE arc.id='$aid' ";
     $arcRow = $dsql->GetOne($arcQuery);
     if (!is_array($arcRow)) {
-        ShowMsg("读取档案基本信息出错!", "-1");
+        ShowMsg("读取文档基本信息出错", "-1");
         exit();
     }
     $query = "SELECT * FROM `#@__channeltype` WHERE id='".$arcRow['channel']."'";
@@ -124,7 +124,7 @@ else if ($dopost == 'save') {
     $query = "
     UPDATE `#@__archives` SET typeid='$typeid',typeid2='$typeid2',sortrank='$sortrank',flag='$flag',click='$click',ismake='$ismake',arcrank='$arcrank',money='$money',title='$title',color='$color',source='$source',writer='$writer',litpic='$litpic',pubdate='$pubdate',notpost='$notpost',description='$description',keywords='$keywords',shorttitle='$shorttitle',filename='$filename',dutyadmin='$adminid' WHERE id='$id'; ";
     if (!$dsql->ExecuteNoneQuery($query)) {
-        ShowMsg("更新数据库archives表时出错，请检查".$dsql->GetError(), "javascript:;");
+        ShowMsg("更新数据库 archives 表时出错，请检查".$dsql->GetError(), "javascript:;");
         exit();
     }
     $imgurls = "{dede:pagestyle maxwidth='$maxwidth' pagepicnum='$pagepicnum' ddmaxwidth='$ddmaxwidth' row='$row' col='$col' value='$pagestyle'/}\r\n";

src/admin/archives_edit.php

@@ -22,13 +22,13 @@ if ($dopost != 'save') {
     $arcQuery = "SELECT ch.typename as channelname,ar.membername as rankname,arc.* FROM `#@__archives` arc LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel LEFT JOIN `#@__arcrank` ar ON ar.`rank`=arc.arcrank WHERE arc.id='$aid'";
     $arcRow = $dsql->GetOne($arcQuery);
     if (!is_array($arcRow)) {
-        ShowMsg("读取档案基本信息出错!", "-1");
+        ShowMsg("读取文档基本信息出错", "-1");
         exit();
     }
     $query = "SELECT * FROM `#@__channeltype` WHERE id='".$arcRow['channel']."'";
     $cInfos = $dsql->GetOne($query);
     if (!is_array($cInfos)) {
-        ShowMsg("读取频道配置信息出错!", "javascript:;");
+        ShowMsg("读取频道配置信息出错", "javascript:;");
         exit();
     }
     $addtable = $cInfos['addtable'];
@@ -128,7 +128,7 @@ else if ($dopost == 'save') {
     //更新数据库的SQL语句
     $inQuery = "UPDATE `#@__archives` SET typeid='$typeid',typeid2='$typeid2',sortrank='$sortrank',flag='$flag',notpost='$notpost',click='$click',ismake='$ismake',arcrank='$arcrank',money='$money',title='$title',color='$color',writer='$writer',source='$source',litpic='$litpic',pubdate='$pubdate',description='$description',keywords='$keywords',shorttitle='$shorttitle',filename='$filename',dutyadmin='$adminid',weight='$weight' WHERE id='$id'; ";
     if (!$dsql->ExecuteNoneQuery($inQuery)) {
-        ShowMsg("更新数据库archives表时出错，请检查", "-1");
+        ShowMsg("更新数据库 archives 表时出错，请检查", "-1");
         exit();
     }
     $cts = $dsql->GetOne("SELECT addtable From `#@__channeltype` WHERE id='$channelid' ");

src/admin/article_edit.php

@@ -25,7 +25,7 @@ if ($dopost != 'save') {
     $query = "SELECT ch.typename AS channelname,ar.membername AS rankname,arc.* FROM `#@__archives` arc LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel LEFT JOIN `#@__arcrank` ar ON ar.`rank`=arc.arcrank WHERE arc.id='$aid' ";
     $arcRow = $dsql->GetOne($query);
     if (!is_array($arcRow)) {
-        ShowMsg("读取档案基本信息出错", "-1");
+        ShowMsg("读取文档基本信息出错", "-1");
         exit();
     }
     $query = "SELECT * FROM `#@__channeltype` WHERE id='".$arcRow['channel']."'";
@@ -141,7 +141,7 @@ else if ($dopost == 'save') {
     //更新数据库的SQL语句
     $query = "UPDATE `#@__archives` SETtypeid='$typeid',typeid2='$typeid2',sortrank='$sortrank',flag='$flag',click='$click',ismake='$ismake',arcrank='$arcrank',money='$money',title='$title',color='$color',writer='$writer',source='$source',litpic='$litpic',pubdate='$pubdate',notpost='$notpost',description='$description',keywords='$keywords',shorttitle='$shorttitle',filename='$filename',dutyadmin='$adminid',weight='$weight'WHERE id='$id'; ";
     if (!$dsql->ExecuteNoneQuery($query)) {
-        ShowMsg('更新数据库archives表时出错，请检查', -1);
+        ShowMsg('更新数据库 archives 表时出错，请检查', -1);
         exit();
     }
     $cts = $dsql->GetOne("SELECT addtable FROM `#@__channeltype` WHERE id='$channelid' ");
@@ -173,7 +173,6 @@ else if ($dopost == 'save') {
             }
         }
     }
-
     //返回成功信息
     $msg = "请选择您的后续操作：<a href='article_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布新文档</a><a href='archives_do.php?aid=".$id."&dopost=editArchives' class='btn btn-success btn-sm'>修改文档</a><a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>查看文档</a><a href='catalog_do.php?cid=$typeid&dopost=listArchives' class='btn btn-success btn-sm'>管理文档</a>$backurl";
     $wintitle = "成功修改文档";

src/admin/css/menu.css

@@ -165,8 +165,9 @@ input[type=text]:focus {
 }
 a.menu-item div {
 	margin-bottom:5px;
-	padding:5px 0;
 	width:40px;
+	height:28px;
+	line-height:28px;
 	color:#545b62;
 	background:#fff;
 	box-shadow:0 0.125rem 0.25rem rgba(0,0,0,.075);
@@ -175,14 +176,15 @@ a.menu-item div {
 	transition:all .3s;
 	cursor:pointer
 }
-a.menu-item:hover div {
+a.menu-item div:hover {
 	color:#fff;
 	background:#545b62
 }
 a.menu-active div {
 	margin-bottom:5px;
-	padding:5px 0;
 	width:40px;
+	height:28px;
+	line-height:28px;
 	color:#fff;
 	background:#545b62;
 	box-shadow:0 0.125rem 0.25rem rgba(0,0,0,.075);

src/admin/diy_edit.php

@@ -51,7 +51,7 @@ else if ($dopost == "delete") {
     else if ($job == "yes") {
         $row = $dsql->GetOne("SELECT `table` FROM `#@__diyforms` WHERE diyid='$diyid'", MYSQL_ASSOC);
         if (!is_array($row)) {
-            ShowMsg("您所指定的自定义表单信息不存在!", "-1");
+            ShowMsg("您所指定的自定义表单信息不存在", "-1");
             exit();
         }
         //删除表

src/admin/feedback_main.php

@@ -48,7 +48,7 @@ function UpdateReplycount($id)
 if ($job == 'del') {
     $query = "DELETE FROM `#@__feedback` WHERE id IN($ids) ";
     $dsql->ExecuteNoneQuery($query);
-    ShowMsg("成功删除指定的评论!", $_COOKIE['ENV_GOBACK_URL'], 0, 500);
+    ShowMsg("成功删除指定的评论", $_COOKIE['ENV_GOBACK_URL'], 0, 500);
     exit();
 }
 //删除相同IP的所有评论
@@ -63,7 +63,7 @@ else if ($job == 'delall') {
         $query = "DELETE FROM `#@__feedback` WHERE $ips ";
         $dsql->ExecuteNoneQuery($query);
     }
-    ShowMsg("成功删除指定相同IP的所有评论!", $_COOKIE['ENV_GOBACK_URL'], 0, 500);
+    ShowMsg("删除所有相同地址评论", $_COOKIE['ENV_GOBACK_URL'], 0, 500);
     exit();
 }
 //审核评论
@@ -78,7 +78,7 @@ else if ($job == 'check') {
     while ($row = $dsql->GetArray()) {
         UpdateReplycount($row['fid']);
     }
-    ShowMsg("成功审核指定评论!", $_COOKIE['ENV_GOBACK_URL'], 0, 500);
+    ShowMsg("成功审核指定评论", $_COOKIE['ENV_GOBACK_URL'], 0, 500);
     exit();
 }
 //浏览评论

src/admin/media_edit.php

@@ -157,7 +157,7 @@ else if ($dopost == 'save') {
     ShowMsg('成功修改一则附件数据', 'media_edit.php?aid='.$aid);
     exit();
 }
-//读取档案信息
+//读取文档信息
 $myrow = $dsql->GetOne("SELECT * FROM `#@__uploads` WHERE aid='".$aid."'");
 if (!is_array($myrow)) {
     ShowMsg('错误，找不到此编号的档案', 'javascript:;');

src/admin/member_pmone.php

@@ -49,7 +49,7 @@ if ($action == "post") {
     $floginid = $cuserLogin->getUserName();
     $fromid = $cuserLogin->getUserID();
     if ($subject == '') {
-        ShowMsg("请填写信息标题!", "-1");
+        ShowMsg("请填写信息标题", "-1");
         exit();
     }
     $msg = CheckUserID($msgtoid, "用户名", false);
@@ -59,7 +59,7 @@ if ($action == "post") {
     }
     $row = $dsql->GetOne("Select * From `#@__member` where userid like '$msgtoid' ");
     if (!is_array($row)) {
-        ShowMsg("您指定的用户不存在,不能发送信息!", "-1");
+        ShowMsg("您指定的用户不存在，不能发送信息", "-1");
         exit();
     }
     $subject = cn_substrR(HtmlReplace($subject, 1), 60);

src/admin/module_make.php

@@ -34,7 +34,7 @@ else if ($action == 'make') {
     $devContent = $dhd->GetHtml();
     $devInfo = (array)json_decode($devContent);
     if (($devInfo['auth_at'] + 60 * 60 * 24 * 365) < time()) {
-        ShowMsg("您的开发者账号已经过期,请登录www.dedebiz.com重新申请!", "-1");
+        ShowMsg("您的开发者账号已经过期，请登录www.dedebiz.com重新申请", "-1");
         exit();
     }
     $filelist = str_replace("\r", "\n", trim($filelist));
@@ -194,7 +194,7 @@ else if ($action == 'edit') {
     $devContent = $dhd->GetHtml();
     $devInfo = (array)json_decode($devContent);
     if (($devInfo['auth_at'] + 60 * 60 * 24 * 365) < time()) {
-        ShowMsg("您的开发者账号已经过期,请登录www.dedebiz.com重新申请!", "-1");
+        ShowMsg("您的开发者账号已经过期，请登录www.dedebiz.com重新申请", "-1");
         exit();
     }
     if (strlen($modulname) > 150) {

src/admin/mychannel_field_edit.php

@@ -57,7 +57,7 @@ if ($action == 'save') {
     if ($dtype == 'stepselect') {
         $arr = $dsql->GetOne("SELECT * FROM `#@__stepselect` WHERE egroup='$fname' ");
         if (!is_array($arr)) {
-            ShowMsg("您设定了字段为联动类型，但系统中没找到与您定义的字段名相同的联动组名!", "-1");
+            ShowMsg("您设定了字段为联动类型，但系统中没找到与您定义的字段名相同的联动组名", "-1");
             exit();
         }
     }

src/admin/plus_edit.php

@@ -39,7 +39,7 @@ if ($dopost == "show") {
     } 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") //保存修改

src/admin/shops_delivery.php

@@ -25,7 +25,7 @@ if ($do == 'add') {
     $InQuery = "INSERT INTO `#@__shops_delivery` (`dname`,`price`,`des`) VALUES ('$dname','$price','$des');";
     $result = $dsql->ExecuteNoneQuery($InQuery);
     if ($result) {
-        ShowMsg("成功添加一个配送方式!", "shops_delivery.php");
+        ShowMsg("成功添加一个配送方式", "shops_delivery.php");
     } else {
         ShowMsg("添加配送方式时发生SQL错误", "-1");
     }

src/admin/soft_edit.php

@@ -24,13 +24,13 @@ if ($dopost != 'save') {
     $dsql->SetQuery($arcQuery);
     $arcRow = $dsql->GetOne($arcQuery);
     if (!is_array($arcRow)) {
-        ShowMsg("读取档案基本信息出错!", "-1");
+        ShowMsg("读取文档基本信息出错", "-1");
         exit();
     }
     $query = "SELECT * FROM `#@__channeltype` WHERE id='".$arcRow['channel']."'";
     $cInfos = $dsql->GetOne($query);
     if (!is_array($cInfos)) {
-        ShowMsg("读取频道配置信息出错!", "javascript:;");
+        ShowMsg("读取频道配置信息出错", "javascript:;");
         exit();
     }
     $addtable = $cInfos['addtable'];
@@ -164,7 +164,7 @@ else if ($dopost == 'save') {
     //修改主档案表
     $inQuery = "UPDATE `#@__archives` SETtypeid='$typeid',typeid2='$typeid2',sortrank='$sortrank',flag='$flag',click='$click',ismake='$ismake',arcrank='$arcrank',`money`='$money',title='$title',color='$color',source='$source',writer='$writer',litpic='$litpic',pubdate='$pubdate',notpost='$notpost',description='$description',keywords='$keywords',shorttitle='$shorttitle',filename='$filename',dutyadmin='$adminid',weight='$weight' WHERE id='$id'; ";
     if (!$dsql->ExecuteNoneQuery($inQuery)) {
-        ShowMsg("更新数据库archives表时出错，请检查", "-1");
+        ShowMsg("更新数据库 archives 表时出错，请检查", "-1");
         exit();
     }
     //软件链接列表

src/admin/spec_edit.php

@@ -23,13 +23,13 @@ if ($dopost != 'save') {
     $arcQuery = "SELECT ch.typename as channelname,ar.membername as rankname,arc.* FROM `#@__archives` arc LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel LEFT JOIN `#@__arcrank` ar ON ar.`rank`=arc.arcrank WHERE arc.id='$aid' ";
     $arcRow = $dsql->GetOne($arcQuery);
     if (!is_array($arcRow)) {
-        ShowMsg("读取档案基本信息出错!", "-1");
+        ShowMsg("读取文档基本信息出错", "-1");
         exit();
     }
     $query = "SELECT * FROM `#@__channeltype` WHERE id='-1'";
     $cInfos = $dsql->GetOne($query);
     if (!is_array($cInfos)) {
-        ShowMsg("读取频道配置信息出错!", "javascript:;");
+        ShowMsg("读取频道配置信息出错", "javascript:;");
         exit();
     }
     $addRow = $dsql->GetOne("SELECT * FROM `#@__addonspec` WHERE aid='$aid'");
@@ -107,7 +107,7 @@ else if ($dopost == 'save') {
     }
     $inQuery = "UPDATE `#@__archives` SET typeid='$typeid',sortrank='$sortrank',flag='$flag',ismake='$ismake',arcrank='$arcrank',click='$click',title='$title',color='$color',writer='$writer',source='$source',litpic='$litpic',pubdate='$pubdate',notpost='$notpost',description='$description',keywords='$keywords',shorttitle='$shorttitle',filename='$filename' WHERE id='$id'; ";
     if (!$dsql->ExecuteNoneQuery($inQuery)) {
-        ShowMsg("更新数据库archives表时出错，请检查", "-1");
+        ShowMsg("更新数据库 archives 表时出错，请检查", "-1");
         exit();
     }
     //专题节点列表

src/admin/sys_data_replace.php

@@ -41,7 +41,7 @@ else if ($action == 'apply') {
     $validate = empty($validate) ? '' : strtolower($validate);
     $svali = GetCkVdValue();
     if ($validate == "" || $validate != $svali) {
-        ShowMsg("安全确认码不正确!", "javascript:;");
+        ShowMsg("安全确认码不正确", "javascript:;");
         exit();
     }
     if ($exptable == '' || $rpfield == '') {

src/admin/sys_info.php

@@ -60,7 +60,7 @@ if ($dopost == "save") {
 else if ($dopost == 'add') {
     CheckCSRF();
     if ($vartype == 'bool' && ($nvarvalue != 'Y' && $nvarvalue != 'N')) {
-        ShowMsg("布尔变量值必须为'Y'或'N'!", "-1");
+        ShowMsg("布尔变量值必须为'Y'或'N'", "-1");
         exit();
     }
     if (trim($nvarname) == '' || preg_match("#[^a-z_]#i", $nvarname)) {

src/admin/sys_repair.php

@@ -53,7 +53,7 @@ else if ($dopost == 1) {
             <span class='text-dark'>已完成数据结构完整性检测</span>
             如果您系统有下面几种问题之一，请检测微表正确性：<br>
             1、无法获得主键，因此无法进行后续操作<br>
-            2、更新数据库archives表时出错<br>
+            2、更新数据库 archives 表时出错<br>
             3、列表显示数据目与实际文档数不一致<br>
             <br><a href='sys_repair.php?dopost=2' class='btn btn-danger btn-sm'>检测数据</a>
             </td>

src/admin/templets/album_add.htm

@@ -11,7 +11,6 @@
   <link rel="stylesheet" href="../static/web/css/daterangepicker.css">
   <link rel="stylesheet" href="../static/web/css/cropper.min.css">
   <link rel="stylesheet" href="../static/web/css/jquery.fileupload.css">
-  <style>table{border-collapse:inherit}</style>
   <script>const cfg_uplitpic_cut = '<?php echo $cfg_uplitpic_cut;?>';</script>
   <script src="../static/web/js/jquery.min.js"></script>
   <script src="../static/web/js/bootstrap.bundle.min.js"></script>
@@ -22,6 +21,7 @@
   <script src="js/album.js"></script>
   <script src="js/handlers.js"></script>
   <script src="../static/web/js/cropper.min.js"></script>
+  <style>table{border-collapse:inherit}</style>
   <script>
   var swfu = null;
   var vcc = 0;

src/admin/templets/album_edit.htm

@@ -11,7 +11,6 @@
   <link rel="stylesheet" href="../static/web/css/daterangepicker.css">
   <link rel="stylesheet" href="../static/web/css/cropper.min.css">
   <link rel="stylesheet" href="../static/web/css/jquery.fileupload.css">
-  <style>table{border-collapse:inherit}</style>
   <script>const cfg_uplitpic_cut = '<?php echo $cfg_uplitpic_cut;?>';</script>
   <script src="../static/web/js/jquery.min.js"></script>
   <script src="../static/web/js/webajax.js"></script>
@@ -22,6 +21,7 @@
   <script src="js/album.js"></script>
   <script src="js/handlers.js"></script>
   <script src="../static/web/js/cropper.min.js"></script>
+  <style>table{border-collapse:inherit}</style>
   <script>
   var swfu = null;
   var vcc = 0;

src/admin/templets/archives_add.htm

@@ -10,7 +10,6 @@
   <link rel="stylesheet" href="../static/web/css/daterangepicker.css">
   <link rel="stylesheet" href="../static/web/css/jquery.fileupload.css">
   <link rel="stylesheet" href="../static/web/css/cropper.min.css">
-  <style>table{border-collapse:inherit}</style>
   <script>const cfg_uplitpic_cut = '<?php echo $cfg_uplitpic_cut;?>';</script>
   <script src="../static/web/js/jquery.min.js"></script>
   <script src="../static/web/js/webajax.js"></script>
@@ -19,6 +18,7 @@
   <script src="../static/web/js/bootstrap.bundle.min.js"></script>
   <script src="js/main.js"></script>
   <script src="../static/web/js/cropper.min.js"></script>
+  <style>table{border-collapse:inherit}</style>
   <script>
   function checkSubmit() {
     if (document.form1.title.value == "") {

src/admin/templets/archives_edit.htm

@@ -10,7 +10,6 @@
   <link rel="stylesheet" href="../static/web/css/daterangepicker.css">
   <link rel="stylesheet" href="../static/web/css/jquery.fileupload.css">
   <link rel="stylesheet" href="../static/web/css/cropper.min.css">
-  <style>table{border-collapse:inherit}</style>
   <script>const cfg_uplitpic_cut = '<?php echo $cfg_uplitpic_cut;?>';</script>
   <script src="../static/web/js/jquery.min.js"></script>
   <script src="../static/web/js/webajax.js"></script>
@@ -19,6 +18,7 @@
   <script src="../static/web/js/moment.min.js"></script>
   <script src="../static/web/js/daterangepicker.js"></script>
   <script src="../static/web/js/cropper.min.js"></script>
+  <style>table{border-collapse:inherit}</style>
   <script>
   function checkSubmit() {
     if (document.form1.title.value == "") {

src/admin/templets/archives_sg_add.htm

@@ -10,7 +10,6 @@
   <link rel="stylesheet" href="../static/web/css/daterangepicker.css">
   <link rel="stylesheet" href="../static/web/css/jquery.fileupload.css">
   <link rel="stylesheet" href="../static/web/css/cropper.min.css">
-  <style>table{border-collapse:inherit}</style>
   <script>const cfg_uplitpic_cut = '<?php echo $cfg_uplitpic_cut;?>';</script>
   <script src="../static/web/js/jquery.min.js"></script>
   <script src="../static/web/js/bootstrap.bundle.min.js"></script>
@@ -19,6 +18,7 @@
   <script src="../static/web/js/daterangepicker.js"></script>
   <script src="js/main.js"></script>
   <script src="../static/web/js/cropper.min.js"></script>
+  <style>table{border-collapse:inherit}</style>
   <script>
   function checkSubmit()
   {

src/admin/templets/archives_sg_edit.htm

@@ -10,7 +10,6 @@
   <link rel="stylesheet" href="../static/web/css/daterangepicker.css">
   <link rel="stylesheet" href="../static/web/css/jquery.fileupload.css">
   <link rel="stylesheet" href="../static/web/css/cropper.min.css">
-  <style>table{border-collapse:inherit}</style>
   <script>const cfg_uplitpic_cut = '<?php echo $cfg_uplitpic_cut;?>';</script>
   <script src="../static/web/js/jquery.min.js"></script>
   <script src="../static/web/js/webajax.js"></script>
@@ -19,6 +18,7 @@
   <script src="js/main.js"></script>
   <script src="../static/web/js/bootstrap.bundle.min.js"></script>
   <script src="../static/web/js/cropper.min.js"></script>
+  <style>table{border-collapse:inherit}</style>
   <script>
   function checkSubmit()
   {

src/admin/templets/article_add.htm

@@ -10,7 +10,6 @@
   <link rel="stylesheet" href="../static/web/css/daterangepicker.css">
   <link rel="stylesheet" href="../static/web/css/jquery.fileupload.css">
   <link rel="stylesheet" href="../static/web/css/cropper.min.css">
-  <style>table{border-collapse:inherit}</style>
   <script>const cfg_uplitpic_cut = '<?php echo $cfg_uplitpic_cut;?>';</script>
   <script src="../static/web/js/jquery.min.js"></script>
   <script src="../static/web/js/webajax.js"></script>
@@ -20,6 +19,7 @@
   <script src="js/handlers.js"></script>
   <script src="../static/web/js/bootstrap.bundle.min.js"></script>
   <script src="../static/web/js/cropper.min.js"></script>
+  <style>table{border-collapse:inherit}</style>
   <script>
   var arctype = 'article';
   function checkSubmit() {

src/admin/templets/article_edit.htm

@@ -10,7 +10,6 @@
   <link rel="stylesheet" href="../static/web/css/daterangepicker.css">
   <link rel="stylesheet" href="../static/web/css/jquery.fileupload.css">
   <link rel="stylesheet" href="../static/web/css/cropper.min.css">
-  <style>table{border-collapse:inherit}</style>
   <script>const cfg_uplitpic_cut = '<?php echo $cfg_uplitpic_cut;?>';</script>
   <script src="../static/web/js/jquery.min.js"></script>
   <script src="../static/web/js/webajax.js"></script>
@@ -20,6 +19,7 @@
   <script src="js/handlers.js"></script>
   <script src="../static/web/js/bootstrap.bundle.min.js"></script>
   <script src="../static/web/js/cropper.min.js"></script>
+  <style>table{border-collapse:inherit}</style>
   <script>
   var swfu = null;
   var arctype = 'article';

src/admin/templets/catalog_add.htm

@@ -113,13 +113,8 @@
 <body>
   <table width="98%" align="center" cellpadding="0" cellspacing="0" class="mt-3 mb-3">
     <tr>
-      <td width="100%">
-        <table width="100%" cellspacing="0" cellpadding="0">
-          <tr>
-            <td><i class="fa fa-map"></i> <a href="catalog_main.php">栏目管理</a> &gt; 增加栏目</td>
-          </tr>
-        </table>
-      </td>
+      <td width="70%"><i class="fa fa-map"></i> <a href="catalog_main.php">栏目管理</a> &gt; 增加栏目</td>
+      <td width="30%" align="right"><a href="catalog_main.php" class="btn btn-success btn-sm">栏目管理</a></td>
     </tr>
   </table>
   <table width="98%" align="center" cellpadding="0" cellspacing="0">

src/admin/templets/catalog_add_quick.htm

@@ -84,13 +84,8 @@
     <input type="hidden" name="savetype" value="" id="savetype">
     <table width="98%" align="center" cellpadding="0" cellspacing="0" class="mt-3 mb-3">
       <tr>
-        <td width="100%">
-          <table width="100%" cellspacing="0" cellpadding="0">
-            <tr>
-              <td><i class="fa fa-map"></i> <a href="catalog_main.php">栏目管理</a> &gt; 批量增加栏目</td>
-            </tr>
-          </table>
-        </td>
+        <td width="70%"><i class="fa fa-map"></i><a href="catalog_main.php">栏目管理</a> &gt; 批量增加栏目</td>
+        <td width="30%" align="right"><a href="catalog_add.php?listtype=all" class="btn btn-success btn-sm">增加顶级栏目</a></td>
       </tr>
     </table>
     <table width="98%" align="center" cellpadding="0" cellspacing="0">

src/admin/templets/catalog_edit.htm

@@ -102,13 +102,8 @@
 <body>
   <table width="98%" align="center" cellpadding="0" cellspacing="0" class="mt-3 mb-3">
     <tr>
-      <td width="100%">
-        <table width="100%" cellspacing="0" cellpadding="0">
-          <tr>
-            <td><i class="fa fa-map"></i> <a href="catalog_main.php">栏目管理</a> &gt; 修改栏目</td>
-          </tr>
-        </table>
-      </td>
+      <td width="70%"><i class="fa fa-map"></i> <a href="catalog_main.php">栏目管理</a> &gt; 修改栏目</td>
+      <td width="30%" align="right"><a href="catalog_add.php?dopost=quick" class="btn btn-success btn-sm">批量增加栏目</a></td>
     </tr>
   </table>
   <table width="98%" align="center" cellpadding="0" cellspacing="0">

src/admin/templets/diy_field_add.htm

@@ -138,7 +138,7 @@
       <td><textarea name="vinnertext" cols="45" rows="5" id="vinnertext" style="width:70%;height:120px"></textarea></td>
     </tr>
     <tr> 
-      <td colspan="2" align="center" class="py-2">
+      <td colspan="2" bgcolor="#f8f8f8" align="center" class="py-2">
         <button type="submit" class="btn btn-success btn-sm">保存</button>
         <button type="reset" class="btn btn-success btn-sm">重置</button>
       </td>

src/admin/templets/mychannel_edit.htm

@@ -66,9 +66,10 @@
     <input type="hidden" name="id" value="<?php echo $id?>">
     <input type="hidden" name="dopost" value="save">
     <input type="hidden" name="issystem" value="<?php echo $row['issystem'];?>">
-    <table width="98%" cellpadding="3" cellspacing="1" align="center" class="table maintable mt-3 mb-3">
+    <table width="98%" cellpadding="3" cellspacing="1" align="center" class="mt-3 mb-3">
       <tr>
-        <td bgcolor="#f8f8f8" colspan="2"><a href="mychannel_main.php">内容模型管理</a> &gt; 修改内容模型</td>
+        <td width="70%"><i class="fa fa-map"></i> <a href="mychannel_main.php">内容模型管理</a> &gt; 修改内容模型</td>
+        <td width="30%" align="right"><a href="mychannel_main.php" class="btn btn-success btn-sm">内容模型管理</a></td>
       </tr>
     </table>
     <table width="98%" cellspacing="0" id="head1" cellpadding="0" align="center" style="display:block">
@@ -243,19 +244,19 @@
         </td>
       </tr>
     </table>
-    <table width="98%" id='adset' cellpadding="3" cellspacing="1" align="center" class="table maintable" style='display:none'>
+    <table width="98%" id="adset" cellpadding="3" cellspacing="1" align="center" class="table maintable" style="display:none">
       <tr>
         <td>模型字段配置（可视化模式）</td>
         <td><button type="button" name="fset" id="fset" onClick="location.href='mychannel_field_add.php?id=<?php echo $id;?>'" class="btn btn-success btn-sm">添加新字段</button></td>
       </tr>
       <tr>
-        <td colspan='2'>
+        <td colspan="2" class="p-0">
           <table width="100%" cellpadding="1" cellspacing="1" align="center">
             <tr bgcolor="#fbfce2" align="center">
-              <td width="28%">表单提示文字</td>
-              <td width="18%">数据字段名</td>
-              <td width="20%">数据类型</td>
-              <td width="18%">表单类型</td>
+              <td width="28%" class="border-top-0">表单提示文字</td>
+              <td width="18%" class="border-top-0">数据字段名</td>
+              <td width="20%" class="border-top-0">数据类型</td>
+              <td width="18%" class="border-top-0">表单类型</td>
               <td>操作</td>
             </tr>
             <?php
@@ -269,7 +270,7 @@
             } else {
             ?>
             <tr>
-              <td colspan='5'>下面列出的字段是附加表的字段，除此外，它还包含主表dede_archives的所有字段</td>
+              <td colspan='5'>下面列出的字段是附加表的字段，除此外，它还包含主表archives的所有字段</td>
             </tr>
             <?php
             }
@@ -337,21 +338,20 @@
       </tr>
       <tr>
         <td  width="30%">模型字段配置（文本模式）<br>
-          修改配置文本可调整字段顺序，但不会修改字段属性
-        </td>
-        <td width="70%"><textarea name="fieldset" style="width:98%;height:300px" rows="10" id="fieldset"><?php echo stripslashes($row['fieldset']);?></textarea></td>
+          修改配置文本可调整字段顺序，但不会修改字段属性</td>
+        <td width="70%"><textarea name="fieldset" rows="10" id="fieldset"><?php echo stripslashes($row['fieldset']);?></textarea></td>
       </tr>
     </table>
-    <table width="98%" cellpadding="3" cellspacing="1" bgcolor="#f8f8f8" align="center" class="table maintable mt-3 mb-3">
+    <table width="98%" cellpadding="3" cellspacing="1" align="center" class="table maintable mt-3 mb-3">
       <tr>
-        <td colspan="2" align="center" class="py-2">
+        <td colspan="2" bgcolor="#f8f8f8" align="center" class="py-2">
           <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>
     </table>
   </form>
-  <?php
+<?php
 if(!empty($openfield))
 {
 	echo "<script>ShowItem2();</script>";

src/admin/templets/mychannel_field_add.htm

@@ -10,21 +10,7 @@
   <script src="../static/web/js/jquery.min.js"></script>
   <script src="../static/web/js/bootstrap.bundle.min.js"></script>
   <script src="js/main.js"></script>
-  <style>
-    .style1 {
-      color: #FF3300
-    }
-    .style2 {
-      color: #545b62
-    }
-    .nw {
-      float: left;
-      width: 150px;
-    }
-    .cls {
-      clear: both;
-    }
-  </style>
+  <style>.style1{color:#FF3300}.style2{color:#545b62}.nw{float:left;width:150px}.cls{clear:both}</style>
   <script>
   var notAllow = " <?php echo $f;?> ";
   function GetFields()
@@ -216,7 +202,7 @@
       <td><textarea name="vinnertext" cols="45" rows="5" id="vinnertext" style="width:70%;height:120px"></textarea></td>
     </tr>
     <tr> 
-      <td colspan="2" align="center" class="py-2">
+      <td colspan="2" bgcolor="#f8f8f8" align="center" class="py-2">
         <button type="submit" name="button1" id="button1" class="btn btn-success btn-sm">保存</button>
         <button type="reset" name="button2" id="button2" class="btn btn-success btn-sm">重置</button>
       </td>

src/admin/templets/mychannel_field_edit.htm

@@ -10,21 +10,7 @@
   <script src="../static/web/js/jquery.min.js"></script>
   <script src="../static/web/js/bootstrap.bundle.min.js"></script>
   <script src="js/main.js"></script>
-  <style>
-    .style1 {
-      color: #FF3300
-    }
-    .style2 {
-      color: #545b62
-    }
-    .nw {
-      float: left;
-      width: 150px;
-    }
-    .cls {
-      clear: both;
-    }
-  </style>
+  <style>.style1{color:#FF3300}.style2{color:#545b62}.nw{float:left;width:150px}.cls{clear:both}</style>
   <script>
     function GetFields() {
       var theform = document.form1;
@@ -210,15 +196,9 @@
         <td><textarea name="vinnertext" cols="45" rows="5" id="vinnertext" style="width:70%;height:120px"><?php echo $ctag->GetInnerText();?></textarea></td>
       </tr>
       <tr>
-        <td colspan="2" bgcolor="#f8f8f8">
-          <table width="100%" cellspacing="0" cellpadding="0" class="table table-borderless">
-            <tr>
-               <td align="center" class="py-2">
-                <button type="submit" name="button1" id="button1" class="btn btn-success btn-sm">保存</button>
-                <button type="reset" name="button3" id="button3" class="btn btn-success btn-sm">重置</button>
-              </td>
-            </tr>
-          </table>
+        <td colspan="2" bgcolor="#f8f8f8" align="center" class="py-2">
+          <button type="submit" name="button1" id="button1" class="btn btn-success btn-sm">保存</button>
+          <button type="reset" name="button3" id="button3" class="btn btn-success btn-sm">重置</button>
         </td>
       </tr>
     </form>

src/admin/templets/soft_add.htm

@@ -10,7 +10,6 @@
   <link rel="stylesheet" href="../static/web/css/daterangepicker.css">
   <link rel="stylesheet" href="../static/web/css/jquery.fileupload.css">
   <link rel="stylesheet" href="../static/web/css/cropper.min.css">
-  <style>table{border-collapse:inherit}</style>
   <script>const cfg_uplitpic_cut = '<?php echo $cfg_uplitpic_cut;?>';</script>
   <script src="../static/web/js/jquery.min.js"></script>
   <script src="../static/web/js/bootstrap.bundle.min.js"></script>
@@ -19,6 +18,7 @@
   <script src="../static/web/js/daterangepicker.js"></script>
   <script src="js/main.js"></script>
   <script src="../static/web/js/cropper.min.js"></script>
+  <style>table{border-collapse:inherit}</style>
   <script>
     function checkSubmit() {
       if (document.form1.title.value == '') {
@@ -55,7 +55,7 @@
     <table width="98%" align="center" cellpadding="0" cellspacing="0" class="mt-3 mb-3">
       <tr>
         <td width="70%"><i class="fa fa-map"></i> <a href="catalog_do.php?cid=<?php echo $cid?>&channelid=<?php echo $channelid?>&dopost=listArchives">软件列表</a> &gt; 发布软件</td>
-        <td align="right"><a href="catalog_main.php" class="btn btn-success btn-sm">栏目管理</a><a href="soft_config.php" class="btn btn-success btn-sm">下载频道参数设定</a></td>
+        <td width="30%" align="right"><a href="catalog_main.php" class="btn btn-success btn-sm">栏目管理</a><a href="soft_config.php" class="btn btn-success btn-sm">下载频道参数设定</a></td>
       </tr>
     </table>
     <table width="98%" align="center" cellpadding="0" cellspacing="0" id="head1">

src/admin/templets/soft_config.htm

@@ -24,17 +24,10 @@
     <form name="form1" action="soft_config.php" method="post">
       <input type="hidden" name="dopost" value="save">
       <tr>
-        <td bgcolor="#f8f8f8" colspan="2">
-          <table width="98%" cellpadding="0" cellspacing="0" class="table table-borderless">
-            <tr>
-              <td width="30%">软件频道设置</td>
-              <td width="70%" align="right"></td>
-            </tr>
-          </table>
-        </td>
+        <td bgcolor="#f8f8f8" colspan="2">软件频道设置</td>
       </tr>
       <tr>
-        <td width="200">链接显示方式：</td>
+        <td width="260">链接显示方式：</td>
         <td>
           <label><input type="radio" name="downtype" value="0" <?php if($row['downtype']==0) echo " checked='checked' ";?>> 直接显示地址列表</label>
           <label><input type="radio" name="downtype" value="1" <?php if($row['downtype']==1) echo " checked='checked' ";?>> 要求进入下载地址列表页</label>
@@ -69,7 +62,7 @@
         </td>
       </tr>
       <tr>
-        <td bgcolor="#f8f8f8" colspan="2">不管是全局，还是具体某软件设置了下面的参数，附件下载方式都必须链接到中转页，否则无效</td>
+        <td colspan="2">不管是全局，还是具体某软件设置了下面的参数，附件下载方式都必须链接到中转页，否则无效</td>
       </tr>
       <tr>
         <td>下载默认等级：</td>
@@ -101,10 +94,8 @@
         </td>
       </tr>
       <tr>
-        <td bgcolor="#f8f8f8" colspan="2">镜像服务器列表：</td>
-      </tr>
-      <tr>
-        <td colspan="2">
+        <td>镜像服务器列表：</td>
+        <td>
           服务器网址：<input type="text" name="serverurl" id="serverurl" value="http://">
           服务器名称：<input type="text" name="servername" id="servername">
           服务器类型：<input type="text" name="servertype" id="servertype" value="默认">
@@ -115,7 +106,7 @@
         <td colspan="2"><textarea name="sites" id="sites" style="width:98%;height:150px"><?php echo $row['sites'];?></textarea></td>
       </tr>
       <tr>
-        <td bgcolor="#f8f8f8" colspan="2">下载说明：</td>
+        <td colspan="2">下载说明：</td>
       </tr>
       <tr>
         <td colspan="2"><?php GetEditor('downmsg',$row['downmsg'],250);?></td>

src/admin/templets/soft_edit.htm

@@ -10,7 +10,6 @@
   <link rel="stylesheet" href="../static/web/css/daterangepicker.css">
   <link rel="stylesheet" href="../static/web/css/jquery.fileupload.css">
   <link rel="stylesheet" href="../static/web/css/cropper.min.css">
-  <style>table{border-collapse:inherit}</style>
   <script>const cfg_uplitpic_cut = '<?php echo $cfg_uplitpic_cut;?>';</script>
   <script src="../static/web/js/jquery.min.js"></script>
   <script src="../static/web/js/bootstrap.bundle.min.js"></script>
@@ -19,6 +18,7 @@
   <script src="../static/web/js/daterangepicker.js"></script>
   <script src="js/main.js"></script>
   <script src="../static/web/js/cropper.min.js"></script>
+  <style>table{border-collapse:inherit}</style>
   <script>
     function checkSubmit() {
       if (document.form1.title.value == '') {
@@ -49,8 +49,8 @@
     <input type="hidden" name="id" value="<?php echo $aid?>">
     <table width="98%" align="center" cellpadding="0" cellspacing="0" class="mt-3 mb-3">
       <tr>
-        <td width="90%"><i class="fa fa-map"></i> <a href="catalog_do.php?cid=<?php echo $arcRow['typeid']?>&dopost=listArchives"></a><a href="catalog_do.php?cid=<?php echo $arcRow['typeid']?>&dopost=listArchives">软件列表</a> &gt; 修改软件</td>
-        <td align="right"><a href="catalog_main.php" class="btn btn-success btn-sm">栏目管理</a></td>
+        <td width="70%"><i class="fa fa-map"></i> <a href="catalog_do.php?cid=<?php echo $arcRow['typeid']?>&dopost=listArchives"></a><a href="catalog_do.php?cid=<?php echo $arcRow['typeid']?>&dopost=listArchives">软件列表</a> &gt; 修改软件</td>
+        <td width="30%" align="right"><a href="catalog_main.php" class="btn btn-success btn-sm">栏目管理</a></td>
       </tr>
     </table>
     <table width="98%" align="center" cellpadding="0" cellspacing="0" id="head1">

src/admin/templets/spec_add.htm

@@ -10,7 +10,6 @@
   <link rel="stylesheet" href="../static/web/css/jquery.fileupload.css">
   <link rel="stylesheet" href="../static/web/css/daterangepicker.css">
   <link rel="stylesheet" href="../static/web/css/cropper.min.css">
-  <style>table{border-collapse:inherit}</style>
   <script>const cfg_uplitpic_cut = '<?php echo $cfg_uplitpic_cut;?>';</script>
   <script src="../static/web/js/jquery.min.js"></script>
   <script src="../static/web/js/webajax.js"></script>
@@ -19,6 +18,7 @@
   <script src="../static/web/js/bootstrap.bundle.min.js"></script>
   <script src="js/main.js"></script>
   <script src="../static/web/js/cropper.min.js"></script>
+  <style>table{border-collapse:inherit}</style>
   <script>
     function checkSubmit() {
       if (document.form1.title.value == "") {

src/admin/templets/spec_edit.htm

@@ -10,7 +10,6 @@
   <link rel="stylesheet" href="../static/web/css/daterangepicker.css">
   <link rel="stylesheet" href="../static/web/css/jquery.fileupload.css">
   <link rel="stylesheet" href="../static/web/css/cropper.min.css">
-  <style>table{border-collapse:inherit}</style>
   <script>const cfg_uplitpic_cut = '<?php echo $cfg_uplitpic_cut;?>';</script>
   <script src="../static/web/js/jquery.min.js"></script>
   <script src="../static/web/js/webajax.js"></script>
@@ -19,6 +18,7 @@
   <script src="../static/web/js/bootstrap.bundle.min.js"></script>
   <script src="js/main.js"></script>
   <script src="../static/web/js/cropper.min.js"></script>
+  <style>table{border-collapse:inherit}</style>
   <script>
     function SelectTemplets(fname) {
       var pos = GetWinPos(800,600);

src/admin/templets/sys_data_replace.htm

@@ -50,15 +50,15 @@
 					<td bgcolor="#f8f8f8">数据库内容替换</td>
 				</tr>
 				<tr>
-					<td>
+					<td class="p-0">
 						<table width="100%" cellpadding="2" cellspacing="2" class="table table-borderless">
 							<tr>
 								<td colspan="2">
 									<div class="alert alert-info mb-0">程序用于批量替换数据库中某字段的内容，此操作极为危险，请小心使用</div>
 								</td>
 							</tr>
-							<tr id='datasel'>
-								<td width="15%" height="60">选择数据表与字段：</td>
+							<tr id="datasel">
+								<td width="260">选择数据表与字段：</td>
 								<td>
 									<table width="98%" cellspacing="0" cellpadding="0">
 										<tr>
@@ -70,7 +70,7 @@
 													echo "<span class='text-danger'>找不到您所指定的数据库 $dbname</span><br>";
 													echo $qbutton;
 												}
-												echo "<select name='exptable' id='exptable' size='10' style='width:60%;height:220px' onchange='ShowFields()'>";
+												echo "<select name='exptable' id='exptable' onchange='ShowFields()' style='width:260px'>";
 												while($row = $dsql->GetArray('t',MYSQL_BOTH)){
 													echo "<option value='{$row[0]}'>{$row[0]}</option>";
 												}
@@ -83,12 +83,12 @@
 											<td id='fields'></td>
 										</tr>
 										<tr>
-											<td>要替换的字段：<input type="text" name="rpfield" id="rpfield"></td>
+											<td><input type="text" name="rpfield" id="rpfield" style="width:260px">（选择替换字段）</td>
 										</tr>
 									</table>
 								</td>
 							</tr>
-							<tr bgcolor="#fbfce2">
+							<tr>
 								<td>替换方式：</td>
 								<td>
 									<label><input type="radio" name="rptype" id="ot1" value="replace" checked="1"> 普通替换</label>
@@ -118,6 +118,7 @@
 						</table>
 					</td>
 				</tr>
+
 				<tr>
 					<td bgcolor="#fbfce2" align="center" class="py-2">
 						<button type="submit" name="Submit" class="btn btn-success btn-sm">开始替换数据</button>

src/admin/templets/sys_sql_query.htm

@@ -27,7 +27,7 @@
 				</td>
 			</tr>
 			<tr>
-				<td>
+				<td class="p-0">
 					<table width="100%" cellspacing="4" cellpadding="2" class="table table-borderless">
 						<form action="sys_sql_query.php" method="post" name="infoform" target="stafrm">
 							<input type="hidden" name="dopost" value="viewinfo">

src/admin/templets/tag_test.htm

@@ -29,14 +29,7 @@
 				<input type="hidden" name="dopost" value="make">
 				<input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>">
 				<tr>
-					<td bgcolor="#f8f8f8" colspan="2">
-						<table width="98%" cellpadding="0" cellspacing="0" class="table table-borderless">
-							<tr>
-								<td width="30%">全局标记测试</td>
-								<td width="70%" align="right"></td>
-							</tr>
-						</table>
-					</td>
+					<td bgcolor="#f8f8f8" colspan="2">全局标记测试</td>
 				</tr>
 				<tr>
 					<td colspan="2">

src/static/ckeditor/skins/kama/readme.md

@@ -0,0 +1,38 @@
+"Kama" Skin
+====================
+
+"Kama" is the default skin of CKEditor 3.x.
+It's been ported to CKEditor 4 and fully featured.
+
+For more information about skins, please check the [CKEditor Skin SDK](https://ckeditor.com/docs/ckeditor4/latest/guide/skin_sdk_intro.html)
+documentation.
+
+Directory Structure
+-------------------
+
+CSS parts:
+- **editor.css**: the main CSS file. It's simply loading several other files, for easier maintenance,
+- **mainui.css**: the file contains styles of entire editor outline structures,
+- **toolbar.css**: the file contains styles of the editor toolbar space (top),
+- **richcombo.css**: the file contains styles of the rich combo ui elements on toolbar,
+- **panel.css**: the file contains styles of the rich combo drop-down, it's not loaded
+until the first panel open up,
+- **elementspath.css**: the file contains styles of the editor elements path bar (bottom),
+- **menu.css**: the file contains styles of all editor menus including context menu and button drop-down,
+it's not loaded until the first menu open up,
+- **dialog.css**: the CSS files for the dialog UI, it's not loaded until the first dialog open,
+- **reset.css**: the file defines the basis of style resets among all editor UI spaces,
+- **preset.css**: the file defines the default styles of some UI elements reflecting the skin preference,
+- **editor_XYZ.css** and **dialog_XYZ.css**: browser specific CSS hacks.
+
+Other parts:
+- **skin.js**: the only JavaScript part of the skin that registers the skin, its browser specific files and its icons and defines the Chameleon feature,
+- **icons/**: contains all skin defined icons,
+- **images/**: contains a fill general used images.
+
+License
+-------
+
+Copyright (c) 2003-2020, CKSource - Frederico Knabben. All rights reserved.
+
+For licensing, see LICENSE.md or [https://ckeditor.com/legal/ckeditor-oss-license](https://ckeditor.com/legal/ckeditor-oss-license)

src/static/ckeditor/skins/kama/skin.js

@@ -0,0 +1,8 @@
+/*
+ Copyright (c) 2003-2020, CKSource - Frederico Knabben. All rights reserved.
+ For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+*/
+CKEDITOR.skin.name="kama";CKEDITOR.skin.ua_editor="ie,iequirks,ie7,ie8";CKEDITOR.skin.ua_dialog="ie,iequirks,ie7,ie8";
+CKEDITOR.skin.chameleon=function(d,c){var b,a="."+d.id;"editor"==c?b=a+" .cke_inner,"+a+" .cke_dialog_tab{background-color:$color;linear-gradient( to bottom,#fff -15px,$color 40px );}"+a+" .cke_toolgroup{linear-gradient( to bottom,#fff,$color 100px );}"+a+" .cke_combo_button{linear-gradient( to top,#fff,$color 100px );}"+a+" .cke_dialog_contents,"+a+" .cke_dialog_footer{background-color:$color !important;}"+a+" .cke_dialog_tab:hover,"+a+" .cke_dialog_tab:active,"+a+" .cke_dialog_tab:focus,"+a+" .cke_dialog_tab_selected{background-color:$color;background-image:none;}":
+"panel"==c&&(b=".cke_menubutton_icon{background-color:$color !important;border-color:$color !important;}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:$color !important;border-color:$color !important;}.cke_menubutton:hover .cke_menubutton_label,.cke_menubutton:focus .cke_menubutton_label,.cke_menubutton:active .cke_menubutton_label{background-color:$color !important;}.cke_menubutton_disabled:hover .cke_menubutton_label,.cke_menubutton_disabled:focus .cke_menubutton_label,.cke_menubutton_disabled:active .cke_menubutton_label{background-color: transparent !important;}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{background-color:$color !important;border-color:$color !important;}.cke_menubutton_disabled .cke_menubutton_icon{background-color:$color !important;border-color:$color !important;}.cke_menuseparator{background-color:$color !important;}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:$color !important;}");
+return b};

src/static/ckeditor/skins/moono/readme.md

@@ -0,0 +1,49 @@
+"Moono" Skin
+====================
+
+This skin has been chosen for the **default skin** of CKEditor 4.x.x (replaced by "Moono-lisa" skin since CKEditor 4.6.0),
+elected from the CKEditor [skin contest](https://ckeditor.com/blog/CKEditor-4-Skin-Contest-Winner/) and further shaped by
+the CKEditor team. "Moono" is maintained by the core developers.
+
+For more information about skins, please check the [CKEditor Skin SDK](https://ckeditor.com/docs/ckeditor4/latest/guide/skin_sdk_intro.html)
+documentation.
+
+Features
+-------------------
+"Moono" is a monochromatic skin, which offers a modern look coupled with gradients and transparency.
+It comes with the following features:
+
+- Chameleon feature with brightness,
+- high-contrast compatibility,
+- graphics source provided in SVG.
+
+Directory Structure
+-------------------
+
+CSS parts:
+- **editor.css**: the main CSS file. It's simply loading several other files, for easier maintenance,
+- **mainui.css**: the file contains styles of entire editor outline structures,
+- **toolbar.css**: the file contains styles of the editor toolbar space (top),
+- **richcombo.css**: the file contains styles of the rich combo ui elements on toolbar,
+- **panel.css**: the file contains styles of the rich combo drop-down, it's not loaded
+until the first panel open up,
+- **elementspath.css**: the file contains styles of the editor elements path bar (bottom),
+- **menu.css**: the file contains styles of all editor menus including context menu and button drop-down,
+it's not loaded until the first menu open up,
+- **dialog.css**: the CSS files for the dialog UI, it's not loaded until the first dialog open,
+- **reset.css**: the file defines the basis of style resets among all editor UI spaces,
+- **preset.css**: the file defines the default styles of some UI elements reflecting the skin preference,
+- **editor_XYZ.css** and **dialog_XYZ.css**: browser specific CSS hacks.
+
+Other parts:
+- **skin.js**: the only JavaScript part of the skin that registers the skin, its browser specific files and its icons and defines the Chameleon feature,
+- **icons/**: contains all skin defined icons,
+- **images/**: contains a fill general used images,
+- **dev/**: contains SVG source of the skin icons.
+
+License
+-------
+
+Copyright (c) 2003-2020, CKSource - Frederico Knabben. All rights reserved.
+
+For licensing, see LICENSE.md or [https://ckeditor.com/legal/ckeditor-oss-license](https://ckeditor.com/legal/ckeditor-oss-license)

src/static/ckeditor/skins/moono/skin.js

@@ -0,0 +1,10 @@
+/*
+ Copyright (c) 2003-2020, CKSource - Frederico Knabben. All rights reserved.
+ For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+*/
+CKEDITOR.skin.name="moono";CKEDITOR.skin.ua_editor="ie,iequirks,ie7,ie8,gecko";CKEDITOR.skin.ua_dialog="ie,iequirks,ie7,ie8";
+CKEDITOR.skin.chameleon=function(){var b=function(){return function(b,e){for(var a=b.match(/[^#]./g),c=0;3>c;c++){var f=c,d;d=parseInt(a[c],16);d=("0"+(0>e?0|d*(1+e):0|d+(255-d)*e).toString(16)).slice(-2);a[f]=d}return"#"+a.join("")}}(),c=function(){var b=new CKEDITOR.template("background:#{to};background-image:linear-gradient(to bottom,{from},{to});filter:progid:DXImageTransform.Microsoft.gradient(gradientType\x3d0,startColorstr\x3d'{from}',endColorstr\x3d'{to}');");return function(c,a){return b.output({from:c,
+to:a})}}(),f={editor:new CKEDITOR.template("{id}.cke_chrome [border-color:{defaultBorder};] {id} .cke_top [ {defaultGradient}border-bottom-color:{defaultBorder};] {id} .cke_bottom [{defaultGradient}border-top-color:{defaultBorder};] {id} .cke_resizer [border-right-color:{ckeResizer}] {id} .cke_dialog_title [{defaultGradient}border-bottom-color:{defaultBorder};] {id} .cke_dialog_footer [{defaultGradient}outline-color:{defaultBorder};border-top-color:{defaultBorder};] {id} .cke_dialog_tab [{lightGradient}border-color:{defaultBorder};] {id} .cke_dialog_tab:hover [{mediumGradient}] {id} .cke_dialog_contents [border-top-color:{defaultBorder};] {id} .cke_dialog_tab_selected, {id} .cke_dialog_tab_selected:hover [background:{dialogTabSelected};border-bottom-color:{dialogTabSelectedBorder};] {id} .cke_dialog_body [background:{dialogBody};border-color:{defaultBorder};] {id} .cke_toolgroup [{lightGradient}border-color:{defaultBorder};] {id} a.cke_button_off:hover, {id} a.cke_button_off:focus, {id} a.cke_button_off:active [{mediumGradient}] {id} .cke_button_on [{ckeButtonOn}] {id} .cke_toolbar_separator [background-color: {ckeToolbarSeparator};] {id} .cke_combo_button [border-color:{defaultBorder};{lightGradient}] {id} a.cke_combo_button:hover, {id} a.cke_combo_button:focus, {id} .cke_combo_on a.cke_combo_button [border-color:{defaultBorder};{mediumGradient}] {id} .cke_path_item [color:{elementsPathColor};] {id} a.cke_path_item:hover, {id} a.cke_path_item:focus, {id} a.cke_path_item:active [background-color:{elementsPathBg};] {id}.cke_panel [border-color:{defaultBorder};] "),
+panel:new CKEDITOR.template(".cke_panel_grouptitle [{lightGradient}border-color:{defaultBorder};] .cke_menubutton_icon [background-color:{menubuttonIcon};] .cke_menubutton:hover .cke_menubutton_icon, .cke_menubutton:focus .cke_menubutton_icon, .cke_menubutton:active .cke_menubutton_icon [background-color:{menubuttonIconHover};] .cke_menuseparator [background-color:{menubuttonIcon};] a:hover.cke_colorbox, a:focus.cke_colorbox, a:active.cke_colorbox [border-color:{defaultBorder};] a:hover.cke_colorauto, a:hover.cke_colormore, a:focus.cke_colorauto, a:focus.cke_colormore, a:active.cke_colorauto, a:active.cke_colormore [background-color:{ckeColorauto};border-color:{defaultBorder};] ")};
+return function(g,e){var a=g.uiColor,a={id:"."+g.id,defaultBorder:b(a,-.1),defaultGradient:c(b(a,.9),a),lightGradient:c(b(a,1),b(a,.7)),mediumGradient:c(b(a,.8),b(a,.5)),ckeButtonOn:c(b(a,.6),b(a,.7)),ckeResizer:b(a,-.4),ckeToolbarSeparator:b(a,.5),ckeColorauto:b(a,.8),dialogBody:b(a,.7),dialogTabSelected:c("#FFFFFF","#FFFFFF"),dialogTabSelectedBorder:"#FFF",elementsPathColor:b(a,-.6),elementsPathBg:a,menubuttonIcon:b(a,.5),menubuttonIconHover:b(a,.3)};return f[e].output(a).replace(/\[/g,"{").replace(/\]/g,
+"}")}}();

src/static/web/css/admin.css

@@ -180,7 +180,7 @@ select:focus,input:focus,textarea:focus {
 	text-align:right
 }
 .wsselect {
-	padding:10px 0;
+	padding:.5rem 0;
 	background:#fff;
 	overflow:auto
 }
@@ -197,7 +197,7 @@ select:focus,input:focus,textarea:focus {
 	z-index:8888
 }
 .pubdlg .title {
-	padding-left:.25rem;
+	padding-left:.5rem;
 	line-height:30px;
 	font-weight:600;
 	color:#545b62;
@@ -223,7 +223,7 @@ select:focus,input:focus,textarea:focus {
 	z-index:10005
 }
 .quickselfoot {
-	padding:10px 0;
+	padding:.5rem 0;
 	border-top:1px solid #dee2e6
 }
 .quickselItem {
@@ -231,15 +231,15 @@ select:focus,input:focus,textarea:focus {
 	line-height:28px
 }
 .quickselItem .topcat {
-	padding-left:10px;
+	padding:0 10px;
 	background:#f8fcf2;
 	clear:both
 }
 .quickselItem .soncat {
-	display:inline-block;
-	padding-left:10px
+	padding:0 10px
 }
 .quickselItem .item {
+	display:inline-block;
 	padding-left:10px
 }
 .mysource,.mywriter {
@@ -427,9 +427,11 @@ span.page-link {
 	background:#f8f8f8;
 	border-radius:.2rem .2rem 0 0
 }
-.thumbnail {
-	max-width:160px;
-	max-height:120px
+.file-icon,svg {
+	margin-right:10px;
+	width:22px;
+	height:22px;
+	border-radius:.2rem
 }
 #text {
 	font-size:0
@@ -447,9 +449,7 @@ span.page-link {
 	border-radius:.2rem;
 	text-align:center
 }
-.file-icon,svg {
-	margin-right:10px;
-	width:22px;
-	height:22px;
-	border-radius:.2rem
+.thumbnail {
+	max-width:160px;
+	max-height:120px
 }

src/system/dedemodule.class.php

@@ -527,7 +527,7 @@ class DedeModule
         else $this->fileListNames[$f] = 1;
         $fileList = '';
         if (!file_exists($filename)) {
-            ShowMsg("文件或文件夹: {$filename} 不存在，无法进行编译!", "-1");
+            ShowMsg("文件或文件夹: {$filename} 不存在，无法进行编译", "-1");
             exit();
         }
         if (is_dir($filename)) {

src/user/album_edit.php

@@ -34,7 +34,7 @@ if (empty($dopost)) {
     $arcQuery = "SELECT arc.*,ch.addtable,ch.fieldset,ch.arcsta FROM `#@__archives` arc LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel WHERE arc.id='$aid' AND arc.mid='".$cfg_ml->M_ID."'; ";
     $row = $dsql->GetOne($arcQuery);
     if (!is_array($row)) {
-        ShowMsg("读取文档信息出错!", "-1");
+        ShowMsg("读取文档信息出错", "-1");
         exit();
     } else if ($row['arcrank'] >= 0) {
         $dtime = time();

src/user/archives_do.php

@@ -46,7 +46,7 @@ else if ($dopost == "addArc") {
     } else {
         $row = $dsql->GetOne("SELECT useraddcon FROM `#@__channeltype` WHERE id='$channelid' ");
         if (!is_array($row)) {
-            ShowMsg("模型参数错误!", "-1");
+            ShowMsg("模型参数错误", "-1");
             exit();
         }
         $addcon = $row['useraddcon'];
@@ -73,7 +73,7 @@ else if ($dopost == "edit") {
     } else {
         $row = $dsql->GetOne("SELECT usereditcon FROM `#@__channeltype` WHERE id='$channelid' ");
         if (!is_array($row)) {
-            ShowMsg("参数错误!", "-1");
+            ShowMsg("参数错误", "-1");
             exit();
         }
         $edit = $row['usereditcon'];

src/user/archives_edit.php

@@ -26,7 +26,7 @@ if (empty($dopost)) {
     $arcQuery = "SELECT arc.*,ch.addtable,ch.fieldset,arc.mtype as mtypeid,ch.arcsta FROM `#@__archives` arc LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel WHERE arc.id='$aid' And arc.mid='".$cfg_ml->M_ID."'; ";
     $row = $dsql->GetOne($arcQuery);
     if (!is_array($row)) {
-        ShowMsg("读取文档信息出错!", "-1");
+        ShowMsg("读取文档信息出错", "-1");
         exit();
     } else if ($row['arcrank'] >= 0) {
         $dtime = time();

src/user/archives_sg_edit.php

@@ -26,7 +26,7 @@ if (empty($dopost)) {
     $arcQuery = "SELECT ch.*,arc.* FROM `#@__arctiny` arc LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel WHERE arc.id='$aid' ";
     $cInfos = $dsql->GetOne($arcQuery);
     if (!is_array($cInfos)) {
-        ShowMsg("读取文档信息出错!", "-1");
+        ShowMsg("读取文档信息出错", "-1");
         exit();
     }
     $addRow = $dsql->GetOne("SELECT * FROM `{$cInfos['addtable']}` WHERE aid='$aid'; ");

src/user/article_edit.php

@@ -26,7 +26,7 @@ if (empty($dopost)) {
     $arcQuery = "SELECT arc.*,ch.addtable,ch.fieldset,arc.mtype as mtypeid,ch.arcsta FROM `#@__archives` arc LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel WHERE arc.id='$aid' And arc.mid='".$cfg_ml->M_ID."'; ";
     $row = $dsql->GetOne($arcQuery);
     if (!is_array($row)) {
-        ShowMsg("读取文档信息出错!", "-1");
+        ShowMsg("读取文档信息出错", "-1");
         exit();
     } else if ($row['arcrank'] >= 0) {
         $dtime = time();

src/user/buy_action.php

@@ -39,7 +39,7 @@ if (isset($pd_encode) && isset($pd_verify) && md5("payment".$pd_encode.$cfg_cook
     }
 }
 if (empty($product)) {
-    ShowMsg("请选择一个产品!", 'javascript:;');
+    ShowMsg("请选择一个产品", 'javascript:;');
     exit();
 }
 $pid = isset($pid) && is_numeric($pid) ? $pid : 0;

src/user/mypay.php

@@ -26,7 +26,7 @@ if ($dopost == '') {
     $ids = preg_replace("#[^0-9,]#", "", $ids);
     $query = "DELETE FROM `#@__member_operation` WHERE aid in($ids) And mid='{$cfg_ml->M_ID}' And product='archive'";
     $dsql->ExecuteNoneQuery($query);
-    ShowMsg("成功删除指定的交易记录!", "mypay.php");
+    ShowMsg("成功删除指定的交易记录", "mypay.php");
     exit();
 }
 ?>

src/user/soft_edit.php

@@ -26,7 +26,7 @@ if (empty($dopost)) {
     $dsql->SetQuery($arcQuery);
     $row = $dsql->GetOne($arcQuery);
     if (!is_array($row)) {
-        ShowMsg("读取档案基本信息出错!", "-1");
+        ShowMsg("读取文档基本信息出错", "-1");
         exit();
     } else if ($row['arcrank'] >= 0) {
         $dtime = time();
@@ -132,7 +132,7 @@ else if ($dopost == 'save') {
     //修改主档案表
     $upQuery = "UPDATE `#@__archives` SET ismake='$ismake',arcrank='$arcrank',typeid='$typeid',title='$title',litpic='$litpic',description='$description',keywords='$keywords',flag='$flag' WHERE id='$aid' AND mid='$mid'; ";
     if (!$dsql->ExecuteNoneQuery($upQuery)) {
-        ShowMsg("更新数据库archives表时出错，请检查", "-1");
+        ShowMsg("更新数据库 archives 表时出错，请检查", "-1");
         exit();
     }
     //软件链接列表