From c5ddf64d733fab02c63356eef874ff11a0ee6c0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?= <93301500+xushubieli@users.noreply.github.com> Date: Tue, 6 Jun 2023 18:21:07 +0800 Subject: [PATCH 01/14] Update admin.css --- src/static/web/css/admin.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css index 4b8008e6..e2421ea4 100644 --- a/src/static/web/css/admin.css +++ b/src/static/web/css/admin.css @@ -84,6 +84,7 @@ input[type=file] { input[type=button],input[type=submit],input[type=reset] { padding:.375rem .75rem; height:auto; + font-size:12px; color:#fff; background:#1eb867; border:0; From 35ce3ec60b3def8bd50925a75ba7e0967f42c601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?= <93301500+xushubieli@users.noreply.github.com> Date: Tue, 6 Jun 2023 18:54:38 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/templets/catalog_add.htm | 2 +- src/admin/templets/catalog_edit.htm | 2 +- src/admin/templets/diy_add.htm | 4 ++-- src/admin/templets/diy_field_add.htm | 2 +- src/admin/templets/diy_main.htm | 2 +- src/admin/templets/mychannel_field_add.htm | 2 +- src/admin/templets/sys_admin_user.htm | 5 ----- 7 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/admin/templets/catalog_add.htm b/src/admin/templets/catalog_add.htm index 9e717a72..d70a4579 100644 --- a/src/admin/templets/catalog_add.htm +++ b/src/admin/templets/catalog_add.htm @@ -112,7 +112,7 @@ 排列顺序： - （由低 > 高） + （由低到高） 浏览权限： （由低 > 高） + （由低到高） 浏览权限： 删除"; - else $needmsg = ''; + else $needmsg = ''; $nForm .= "
$needmsg
\r\n"; $newRowStart++; } @@ -171,7 +171,7 @@ if ($dopost != 'save') { if ($servermsg == '') { $servermsg = '下载地址'.$i; } - if ($softurl != 'http://') { + if ($softurl != '') { if ($islocal == 1) $urls .= "{dede:link islocal='$islocal' text='{$servermsg}'} $softurl {/dede:link}\r\n"; else if ($isneed) $urls .= "{dede:link text='$servermsg'} $softurl {/dede:link}\r\n"; else continue; diff --git a/src/admin/templets/catalog_add.htm b/src/admin/templets/catalog_add.htm index d70a4579..4883e2ab 100644 --- a/src/admin/templets/catalog_add.htm +++ b/src/admin/templets/catalog_add.htm @@ -295,6 +295,14 @@ else if (window.navigator.userAgent.indexOf("Firefox") >= 1) return 'FF'; else return "OT"; } + function checkSubmit() { + if (document.form1.typename.value == "") { + alert("栏目名称不能为空"); + document.form1.typename.focus(); + return false; + } + return true; + } function SelectTemplets(fname) { var pos = GetWinPos(800,600); window.open("./dialog/select_templets.php?f=" + fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left=" + pos.left + ", top=" + pos.top); @@ -341,14 +349,6 @@ tobj.style.display = "none"; } } - function checkSubmit() { - if (document.form1.typename.value == "") { - alert("栏目名称不能为空"); - document.form1.typename.focus(); - return false; - } - return true; - } function CheckPathSet() { var surl = document.getElementById("siteurl"); var sreid = document.getElementById("reid"); diff --git a/src/admin/templets/catalog_edit.htm b/src/admin/templets/catalog_edit.htm index a0bad0bc..e233925a 100644 --- a/src/admin/templets/catalog_edit.htm +++ b/src/admin/templets/catalog_edit.htm @@ -326,6 +326,14 @@ else if (window.navigator.userAgent.indexOf("Firefox") >= 1) return 'FF'; else return "OT"; } + function checkSubmit() { + if (document.form1.typename.value == "") { + alert("栏目名称不能为空"); + document.form1.typename.focus(); + return false; + } + return true; + } function SelectTemplets(fname) { var pos = GetWinPos(800,600); window.open("./dialog/select_templets.php?f=" + fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left=" + pos.left + ", top=" + pos.top); @@ -372,14 +380,6 @@ tobj.style.display = "none"; } } - function checkSubmit() { - if (document.form1.typename.value == "") { - alert("栏目名称不能为空"); - document.form1.typename.focus(); - return false; - } - return true; - } function CheckCross() { var cross2 = document.getElementById('cross2'); var crossid = document.getElementById('crossid'); diff --git a/src/admin/templets/soft_add.htm b/src/admin/templets/soft_add.htm index 9f87ab8a..5195be62 100644 --- a/src/admin/templets/soft_add.htm +++ b/src/admin/templets/soft_add.htm @@ -24,7 +24,7 @@ var endNum = parseInt(document.form1.picnum.value) + startNum - 1; if (endNum > 30) endNum = 30; for (startNum; startNum <= endNum; startNum++) { - upfield.innerHTML += "
"; + upfield.innerHTML += "
"; } } function ShowHideAddr() { @@ -274,9 +274,9 @@ - + - +
官方网址： 演示地址：
@@ -286,14 +286,14 @@ - + + + - - -
软件大小： + - + 需会员权限： @@ -320,10 +320,11 @@ - - + @@ -331,9 +332,31 @@
本地地址： + 本地上传： + 地址名称：
+ + + + + +
链接上传： + + + +
+ +
+ + + + +
镜像上传：
- - - - + + + +
- - - - - -
其它地址： - - - -
- -
diff --git a/src/admin/templets/soft_config.htm b/src/admin/templets/soft_config.htm index 620fbc05..6f18c6e9 100644 --- a/src/admin/templets/soft_config.htm +++ b/src/admin/templets/soft_config.htm @@ -18,23 +18,18 @@ - - - - + @@ -54,8 +49,8 @@ @@ -84,16 +79,16 @@ @@ -116,9 +111,18 @@ diff --git a/src/admin/templets/soft_edit.htm b/src/admin/templets/soft_edit.htm index 95ab6d0c..bf224520 100644 --- a/src/admin/templets/soft_edit.htm +++ b/src/admin/templets/soft_edit.htm @@ -24,7 +24,7 @@ var endNum = parseInt(document.form1.picnum.value) + startNum; if (endNum > 30) endNum = 30; for (startNum; startNum < endNum; startNum++) { - upfield.innerHTML += "
"; + upfield.innerHTML += "
"; } } function ShowHideAddr() { @@ -280,7 +280,7 @@
软件下载设置
-
软件模型的附件下载方式都必须链接到中转页，否则无效
-
链接显示方式： - - + +
附件下载方式：软件下载方式： - - + +
镜像处理方式： - - + +
参数限制方式： - - + +
镜像服务器列表： - - - + + +
- + @@ -292,7 +292,7 @@
官方网址： 程序演示：
- +
软件大小： 需会员权限： - + diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css index e2421ea4..f3c57e78 100644 --- a/src/static/web/css/admin.css +++ b/src/static/web/css/admin.css @@ -260,7 +260,6 @@ body.hidemenu .body-right { right:5px; height:20px; line-height:20px; - font-size:12px; color:#545b62; background:0; border:0 @@ -375,7 +374,7 @@ body.hidemenu .body-right { padding:.5rem; width:120px; background:#fff; - border:2px solid #dee2e6; + border:1px solid #dee2e6; z-index:10005 } .wsselect { @@ -385,7 +384,7 @@ body.hidemenu .body-right { } .pubdlg { background:#fff; - border:2px solid #dee2e6; + border:1px solid #dee2e6; z-index:8888 } .pubdlg .title { @@ -440,7 +439,7 @@ body.hidemenu .body-right { .mysource,.mywriter { width:300px; background:#fff; - border:2px solid #dee2e6; + border:1px solid #dee2e6; z-index:10001 } #uploadfield { From 21e978f778a28cc74403576dd2e78068a94d1482 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?= <93301500+xushubieli@users.noreply.github.com> Date: Wed, 7 Jun 2023 14:43:36 +0800 Subject: [PATCH 06/14] =?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/admin/dialog/select_images.php | 7 +++---- src/admin/dialog/select_media.php | 7 +++---- src/admin/dialog/select_soft.php | 7 +++---- src/admin/dialog/select_templets.php | 7 +++---- src/admin/templets/ad_add.htm | 2 +- src/admin/templets/ad_edit.htm | 2 +- src/admin/templets/ad_main.htm | 2 +- src/static/web/css/admin.css | 18 +++++++++++++++++- 8 files changed, 32 insertions(+), 20 deletions(-) diff --git a/src/admin/dialog/select_images.php b/src/admin/dialog/select_images.php index 704caa53..a9d9e8c7 100644 --- a/src/admin/dialog/select_images.php +++ b/src/admin/dialog/select_images.php @@ -59,18 +59,17 @@ if (!empty($iseditor)) { - - -
+ +
其它地址：链接上传： - +
-
+ " : ''; echo $noeditor;?> diff --git a/src/admin/dialog/select_media.php b/src/admin/dialog/select_media.php index 715ad4a6..8cbffc77 100644 --- a/src/admin/dialog/select_media.php +++ b/src/admin/dialog/select_media.php @@ -49,14 +49,13 @@ if (!empty($noeditor)) { - - -
+ +
- + diff --git a/src/admin/dialog/select_soft.php b/src/admin/dialog/select_soft.php index 597abd78..654fb4be 100644 --- a/src/admin/dialog/select_soft.php +++ b/src/admin/dialog/select_soft.php @@ -48,14 +48,13 @@ if (!empty($noeditor)) { - - -
+ +
From beca1ce2d9d7af55253f775fce793c19b5df258a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?= <93301500+xushubieli@users.noreply.github.com> Date: Wed, 7 Jun 2023 15:55:00 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=80=82=E9=85=8D?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BD=AF=E4=BB=B6=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/catalog_add.php | 2 +- src/admin/soft_edit.php | 4 +-- src/admin/templets/album_add.htm | 2 +- src/admin/templets/album_edit.htm | 2 +- src/admin/templets/archives_add.htm | 2 +- src/admin/templets/archives_edit.htm | 2 +- src/admin/templets/article_add.htm | 2 +- src/admin/templets/article_edit.htm | 2 +- src/admin/templets/catalog_add.htm | 4 +-- src/admin/templets/catalog_edit.htm | 4 +-- src/admin/templets/mychannel_add.htm | 2 +- src/admin/templets/mychannel_edit.htm | 2 +- src/admin/templets/soft_add.htm | 21 +++++++------ src/admin/templets/soft_config.htm | 2 +- src/admin/templets/soft_edit.htm | 17 ++++++----- src/admin/templets/spec_add.htm | 2 +- src/admin/templets/spec_edit.htm | 2 +- src/install/sql-dfdata.txt | 2 +- src/static/web/css/admin.css | 9 +++--- src/static/web/css/style.css | 7 +++-- src/static/web/js/style.js | 4 +-- src/static/web/js/user.album.js | 2 +- src/theme/dedebiz/foot.htm | 2 +- src/user/soft_edit.php | 2 +- src/user/templets/album_edit.htm | 2 +- src/user/templets/soft_add.htm | 44 +++++++++++++-------------- src/user/templets/soft_edit.htm | 40 ++++++++++++------------ 27 files changed, 97 insertions(+), 91 deletions(-) diff --git a/src/admin/catalog_add.php b/src/admin/catalog_add.php index c0a804b9..eba0b87c 100644 --- a/src/admin/catalog_add.php +++ b/src/admin/catalog_add.php @@ -155,7 +155,7 @@ if ($dopost == 'quick') { if ($siteurl != '') { $siteurl = preg_replace("#\/$#", "", $siteurl); if (!preg_match("#http:\/\/#i", $siteurl)) { - ShowMsg("您绑定的二级域名无效，需要以http开头的链接", "-1"); + ShowMsg("您绑定的二级域名无效，请输入绑定域名http开头", "-1"); exit(); } if (preg_match("#".$cfg_basehost."#i", $siteurl)) { diff --git a/src/admin/soft_edit.php b/src/admin/soft_edit.php index 906faaaf..44692ff8 100644 --- a/src/admin/soft_edit.php +++ b/src/admin/soft_edit.php @@ -48,8 +48,8 @@ if ($dopost != 'save') { if ($ctag->GetName() == 'link') { $islocal = $ctag->GetAtt('islocal'); if ($islocal != 1) $needmsg = ""; - else $needmsg = ''; - $nForm .= "
$needmsg
\r\n"; + else $needmsg = ''; + $nForm .= "
$needmsg
\r\n"; $newRowStart++; } } diff --git a/src/admin/templets/album_add.htm b/src/admin/templets/album_add.htm index ec20f8fe..05dffac0 100644 --- a/src/admin/templets/album_add.htm +++ b/src/admin/templets/album_add.htm @@ -314,7 +314,7 @@
- + diff --git a/src/admin/dialog/select_templets.php b/src/admin/dialog/select_templets.php index d279cb91..8c9c6bb3 100644 --- a/src/admin/dialog/select_templets.php +++ b/src/admin/dialog/select_templets.php @@ -40,14 +40,13 @@ if (empty($comeback)) { - - -
+ +
@@ -321,10 +324,9 @@
- + diff --git a/src/admin/templets/ad_add.htm b/src/admin/templets/ad_add.htm index 035aefae..282aaaa8 100644 --- a/src/admin/templets/ad_add.htm +++ b/src/admin/templets/ad_add.htm @@ -14,7 +14,7 @@ - + diff --git a/src/admin/templets/ad_edit.htm b/src/admin/templets/ad_edit.htm index 3af27937..7055c7c1 100644 --- a/src/admin/templets/ad_edit.htm +++ b/src/admin/templets/ad_edit.htm @@ -13,7 +13,7 @@ - + diff --git a/src/admin/templets/ad_main.htm b/src/admin/templets/ad_main.htm index 18029562..e9dbdc9f 100644 --- a/src/admin/templets/ad_main.htm +++ b/src/admin/templets/ad_main.htm @@ -10,7 +10,7 @@ - + diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css index f3c57e78..c439cc99 100644 --- a/src/static/web/css/admin.css +++ b/src/static/web/css/admin.css @@ -153,6 +153,9 @@ body.hidemenu .body-right { right:0; bottom:0 } +.body-bg { + background:#f5f5f5 +} .main,.menu { width:100%; height:99% @@ -573,6 +576,19 @@ body.hidemenu .body-right { width:20px; height:20px } +.upload-bg { + margin:10px; + background:#fff +} +.napisdiv { + position:absolute; + left:10; + top:10; + display:none; + width:150px; + height:100px; + z-index:9998 +} .fileinput-button { display:inline-block; position:relative; @@ -591,7 +607,7 @@ span.page-link { color:#fff; background:#1eb867 } -table,input,select,textarea,.search,.menu-body,.coolbg,.mysource,.mywriter,.pubdlg,.colordlg,.quickselitem .topcat,.web-info,.cke_chrome,.cke_inner,.pagination,.card,.form-control,.btn-sm,.alert,.rounded,#edsta { +table,input,select,textarea,.search,.menu-body,.coolbg,.mysource,.mywriter,.pubdlg,.colordlg,.quickselitem .topcat,.web-info,.upload-bg,.cke_chrome,.cke_inner,.pagination,.card,.form-control,.btn-sm,.alert,.rounded,#edsta { border-radius:.5rem!important } .btn-xs { From 5cd53f73c425ed9662f6b9f352728de71ec5f07f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?= <93301500+xushubieli@users.noreply.github.com> Date: Wed, 7 Jun 2023 14:55:58 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/soft_edit.php | 2 +- src/admin/templets/soft_add.htm | 10 ++++++---- src/admin/templets/soft_edit.htm | 7 +++++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/admin/soft_edit.php b/src/admin/soft_edit.php index c1b204b5..906faaaf 100644 --- a/src/admin/soft_edit.php +++ b/src/admin/soft_edit.php @@ -48,7 +48,7 @@ if ($dopost != 'save') { if ($ctag->GetName() == 'link') { $islocal = $ctag->GetAtt('islocal'); if ($islocal != 1) $needmsg = ""; - else $needmsg = ''; + else $needmsg = ''; $nForm .= "
$needmsg
\r\n"; $newRowStart++; } diff --git a/src/admin/templets/soft_add.htm b/src/admin/templets/soft_add.htm index 5195be62..dfa64234 100644 --- a/src/admin/templets/soft_add.htm +++ b/src/admin/templets/soft_add.htm @@ -275,8 +275,11 @@ - - + +
官方网址： 演示地址：演示网址： + + +
- diff --git a/src/admin/templets/soft_edit.htm b/src/admin/templets/soft_edit.htm index bf224520..30123604 100644 --- a/src/admin/templets/soft_edit.htm +++ b/src/admin/templets/soft_edit.htm @@ -281,8 +281,11 @@ - - + +
本地上传： + - 地址名称：
官方网址： 程序演示：演示网址： + + +
标题颜色： - +
diff --git a/src/admin/templets/album_edit.htm b/src/admin/templets/album_edit.htm index 9840228d..6a6a17a1 100644 --- a/src/admin/templets/album_edit.htm +++ b/src/admin/templets/album_edit.htm @@ -353,7 +353,7 @@
标题颜色： - +
diff --git a/src/admin/templets/archives_add.htm b/src/admin/templets/archives_add.htm index e937c9dd..558b36dd 100644 --- a/src/admin/templets/archives_add.htm +++ b/src/admin/templets/archives_add.htm @@ -247,7 +247,7 @@
标题颜色： - +
diff --git a/src/admin/templets/archives_edit.htm b/src/admin/templets/archives_edit.htm index 686f96cd..f231aeaf 100644 --- a/src/admin/templets/archives_edit.htm +++ b/src/admin/templets/archives_edit.htm @@ -239,7 +239,7 @@ 		标题颜色： - +
diff --git a/src/admin/templets/article_add.htm b/src/admin/templets/article_add.htm index a00b6b3c..12178c4d 100644 --- a/src/admin/templets/article_add.htm +++ b/src/admin/templets/article_add.htm @@ -256,7 +256,7 @@ 		标题颜色： - +
diff --git a/src/admin/templets/article_edit.htm b/src/admin/templets/article_edit.htm index 6a6992a7..cef9ae58 100644 --- a/src/admin/templets/article_edit.htm +++ b/src/admin/templets/article_edit.htm @@ -239,7 +239,7 @@ 标题颜色： - + diff --git a/src/admin/templets/catalog_add.htm b/src/admin/templets/catalog_add.htm index 4883e2ab..8d938dbc 100644 --- a/src/admin/templets/catalog_add.htm +++ b/src/admin/templets/catalog_add.htm @@ -117,7 +117,7 @@ 不启用（需要绑定二级域名，系统变量中开启支持多站点） 绑定域名： - （需要以http开头的链接） + （请输入绑定域名http开头） diff --git a/src/admin/templets/catalog_edit.htm b/src/admin/templets/catalog_edit.htm index e233925a..3cd79ad3 100644 --- a/src/admin/templets/catalog_edit.htm +++ b/src/admin/templets/catalog_edit.htm @@ -113,7 +113,7 @@ > 不启用（仅顶级栏目启用，子类栏目无效） 绑定域名： - （需要以http开头的链接） + （请输入绑定域名http开头） 列表模板： diff --git a/src/admin/templets/mychannel_add.htm b/src/admin/templets/mychannel_add.htm index 28c0d9f6..9b504505 100644 --- a/src/admin/templets/mychannel_add.htm +++ b/src/admin/templets/mychannel_add.htm @@ -64,7 +64,7 @@ getUserRank(); - $dsql->SetQuery("SELECT * FROM `#@__arcrank` where adminrank<='$urank' And `rank`>=10"); + $dsql->SetQuery("SELECT * FROM `#@__arcrank` where adminrank<='$urank' And `rank` >= 10"); $dsql->Execute(); while($row2 = $dsql->GetObject()) { diff --git a/src/admin/templets/mychannel_edit.htm b/src/admin/templets/mychannel_edit.htm index b443d220..24cecdf7 100644 --- a/src/admin/templets/mychannel_edit.htm +++ b/src/admin/templets/mychannel_edit.htm @@ -70,7 +70,7 @@ getUserRank(); - $dsql->SetQuery("SELECT * FROM `#@__arcrank` where adminrank<='$urank' And `rank`>=10"); + $dsql->SetQuery("SELECT * FROM `#@__arcrank` where adminrank<='$urank' And `rank` >= 10"); $dsql->Execute(); while($row2 = $dsql->GetObject()) { diff --git a/src/admin/templets/soft_add.htm b/src/admin/templets/soft_add.htm index dfa64234..1e9624ff 100644 --- a/src/admin/templets/soft_add.htm +++ b/src/admin/templets/soft_add.htm @@ -24,13 +24,13 @@ var endNum = parseInt(document.form1.picnum.value) + startNum - 1; if (endNum > 30) endNum = 30; for (startNum; startNum <= endNum; startNum++) { - upfield.innerHTML += "
"; + upfield.innerHTML += "
"; } } function ShowHideAddr() { document.getElementById('morelink').style.display = (document.getElementById('morelink').style.display == 'block' ? 'none' : 'block'); document.getElementById('morelink').style.height = '100%'; - document.getElementById('btsh3').value = (document.getElementById('morelink').style.display == 'block' ? '隐藏地址' : '显示地址'); + document.getElementById('btsh3').value = (document.getElementById('morelink').style.display == 'block' ? '隐藏网址' : '显示网址'); } @@ -274,10 +274,11 @@ - + @@ -302,7 +303,7 @@ - +
官方网址： 演示网址： - + +
本地上传： - + 地址名称：下载名称：
@@ -341,8 +342,8 @@ 链接上传： - - + + @@ -439,7 +440,7 @@ 标题颜色： - + diff --git a/src/admin/templets/soft_config.htm b/src/admin/templets/soft_config.htm index 6f18c6e9..2625165a 100644 --- a/src/admin/templets/soft_config.htm +++ b/src/admin/templets/soft_config.htm @@ -59,7 +59,7 @@