From 3ceddfb79421759d060abaca9e3c104bd5391b9e 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: Fri, 2 Jun 2023 10:36:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=89=8D=E5=8F=B0=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=9C=86=E6=B6=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/js/album.js | 56 ++++++++++++------------- src/admin/templets/soft_edit.htm | 2 +- src/static/web/css/style.css | 2 +- src/system/archive/archives.class.php | 6 +-- src/system/archive/sglistview.class.php | 2 +- src/system/taglib/infolink.lib.php | 11 ++--- src/theme/dedebiz/list_image.htm | 2 +- 7 files changed, 38 insertions(+), 43 deletions(-) diff --git a/src/admin/js/album.js b/src/admin/js/album.js index a9392c03..7c2eafc4 100644 --- a/src/admin/js/album.js +++ b/src/admin/js/album.js @@ -11,6 +11,34 @@ function checkSubmitAlb() { $("#albums").val(JSON.stringify(albums)); return true; } +function checkMuList(psid, cmid) { + if ($Obj('pagestyle3').checked) { + $Obj('cfgmulist').style.display = 'table-row'; + $Obj('spagelist').style.display = 'none'; + } else if ($Obj('pagestyle1').checked) { + $Obj('cfgmulist').style.display = 'none'; + $Obj('spagelist').style.display = 'table-row'; + } else { + $Obj('cfgmulist').style.display = 'none'; + $Obj('spagelist').style.display = 'none'; + } +} +//删除已经上传的图片 +function delAlbPic(pid) { + var tgobj = $Obj('atlasok' + pid); + fetch('swfupload.php?dopost=del&id=' + pid).then(resp => resp.text()).then((d) => { + tgobj.innerHTML = d; + $Obj('gallery').removeChild(tgobj); + }); +} +//删除已经上传的图片修改时用 +function delAlbPicOld(picfile, pid) { + var tgobj = $Obj('albold' + pid); + fetch('swfupload.php?dopost=delold&picfile=' + picfile).then(resp => resp.text()).then((d) => { + tgobj.innerHTML = d; + $Obj('galleryedit').removeChild(tgobj); + }); +} function seePicNewAlb(f, imgdid, frname, hpos, acname) { var newobj = null; if (f.value == '') return; @@ -45,32 +73,4 @@ function seePicNewAlb(f, imgdid, frname, hpos, acname) { nForm.dopost.value = 'save'; nForm.target = ''; nForm.litpic.disabled = true; -} -function checkMuList(psid, cmid) { - if ($Obj('pagestyle3').checked) { - $Obj('cfgmulist').style.display = 'table-row'; - $Obj('spagelist').style.display = 'none'; - } else if ($Obj('pagestyle1').checked) { - $Obj('cfgmulist').style.display = 'none'; - $Obj('spagelist').style.display = 'table-row'; - } else { - $Obj('cfgmulist').style.display = 'none'; - $Obj('spagelist').style.display = 'none'; - } -} -//删除已经上传的图片 -function delAlbPic(pid) { - var tgobj = $Obj('atlasok' + pid); - fetch('swfupload.php?dopost=del&id=' + pid).then(resp=>resp.text()).then((d)=>{ - tgobj.innerHTML = d; - $Obj('gallery').removeChild(tgobj); - }); -} -//删除已经上传的图片修改时用 -function delAlbPicOld(picfile, pid) { - var tgobj = $Obj('albold' + pid); - fetch('swfupload.php?dopost=delold&picfile=' + picfile).then(resp=>resp.text()).then((d)=>{ - tgobj.innerHTML = d; - $Obj('galleryedit').removeChild(tgobj); - }); } \ No newline at end of file diff --git a/src/admin/templets/soft_edit.htm b/src/admin/templets/soft_edit.htm index 4cbadd91..83aadec4 100644 --- a/src/admin/templets/soft_edit.htm +++ b/src/admin/templets/soft_edit.htm @@ -405,7 +405,7 @@ - + diff --git a/src/static/web/css/style.css b/src/static/web/css/style.css index 598065cf..c810a899 100644 --- a/src/static/web/css/style.css +++ b/src/static/web/css/style.css @@ -403,7 +403,7 @@ input[type=file] { .cke_top,.item-theme-img img,.list-article-img img,.article-hot-img img { border-radius:.5rem .5rem 0 0!important } -.cke_bottom,.list-article-body { +.cke_bottom,.list-article-radius { border-radius:0 0 .5rem .5rem!important } #validateimg,.btn-send { diff --git a/src/system/archive/archives.class.php b/src/system/archive/archives.class.php index b64faf83..f6f55973 100755 --- a/src/system/archive/archives.class.php +++ b/src/system/archive/archives.class.php @@ -781,7 +781,7 @@ class Archives $i++; } } else { - $revalue = "\r\n"; foreach ($this->SplitTitles as $k => $v) { if ($i == 1) { $revalue .= "\r\n"; @@ -890,7 +890,7 @@ class Archives $i++; } } else { - $revalue = "\r\n"; foreach ($this->SplitTitles as $k => $v) { if ($i == 1) { if ($cfg_rewrite == 'Y') { @@ -930,7 +930,7 @@ class Archives */ function GetPagebreakDM($totalPage, $nowPage, $aid) { - global $cfg_rewrite,$cfg_cmsurl; + global $cfg_rewrite, $cfg_cmsurl; if ($totalPage == 1) { return ""; } diff --git a/src/system/archive/sglistview.class.php b/src/system/archive/sglistview.class.php index 161a6eaa..224e5567 100755 --- a/src/system/archive/sglistview.class.php +++ b/src/system/archive/sglistview.class.php @@ -931,7 +931,7 @@ class SgListView */ function GetPageListDM($list_len, $listitem = "index,end,pre,next,pageno") { - global $nativeplace, $infotype, $keyword,$cfg_rewrite; + global $nativeplace, $infotype, $keyword, $cfg_rewrite; if (empty($nativeplace)) $nativeplace = 0; if (empty($infotype)) $infotype = 0; if (empty($keyword)) $keyword = ''; diff --git a/src/system/taglib/infolink.lib.php b/src/system/taglib/infolink.lib.php index 9df1d421..7c6ab453 100755 --- a/src/system/taglib/infolink.lib.php +++ b/src/system/taglib/infolink.lib.php @@ -113,7 +113,6 @@ function lib_infolink(&$ctag, &$refObj) } else { $ff .= " {$em}\r\n"; } - } } } @@ -128,8 +127,7 @@ function lib_infolink(&$ctag, &$refObj) $fields['nativeplace'] .= " {$em_nativeplaces[$t]} -"; } foreach ($em_nativeplaces as $eid => $em) { - if ($eid < $t + 1 && $eid > $t) - { + if ($eid < $t + 1 && $eid > $t) { if ($eid === $nativeplace) { $fields['nativeplace'] .= " {$em}\r\n"; } else { @@ -187,8 +185,7 @@ function lib_infolink(&$ctag, &$refObj) $i = 0; $ff = ""; foreach ($em_infotypes as $eid => $em) { - if ($eid < $sontype + 1 && $eid > $sontype) - { + if ($eid < $sontype + 1 && $eid > $sontype) { if (is_str_float($eid)) { $i++; } @@ -200,7 +197,6 @@ function lib_infolink(&$ctag, &$refObj) } else { $ff .= " {$em}\r\n"; } - } } } @@ -215,8 +211,7 @@ function lib_infolink(&$ctag, &$refObj) $fields['infotype'] .= " {$em_infotypes[$t]} -"; } foreach ($em_infotypes as $eid => $em) { - if ($eid < $t + 1 && $eid > $t) - { + if ($eid < $t + 1 && $eid > $t) { if ($eid === $infotype) { $fields['infotype'] .= " {$em}\r\n"; } else { diff --git a/src/theme/dedebiz/list_image.htm b/src/theme/dedebiz/list_image.htm index 43e1920d..ab6cc87f 100644 --- a/src/theme/dedebiz/list_image.htm +++ b/src/theme/dedebiz/list_image.htm @@ -35,7 +35,7 @@
[field:array runphp='yes']@me=(strpos(@me['litpic'],'thumbnail')?"":"{@me[");[/field:array]
-
+

[field:title/]

[field:uname/]
更新时间：