From 2609279e65ce964f441eaad4d8aabfa3477f8296 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?= Date: Sun, 10 Nov 2024 11:16:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/dialog/select_images.php | 10 ++--- src/admin/dialog/select_media.php | 30 +++++++-------- src/admin/dialog/select_soft.php | 18 ++++----- src/admin/dialog/select_templets.php | 42 ++++++++++----------- src/admin/inc/inc_catalog_options.php | 18 ++++----- src/static/web/css/admin.css | 51 +++++++++++++------------- src/system/typelink/typelink.class.php | 6 +-- 7 files changed, 88 insertions(+), 87 deletions(-) diff --git a/src/admin/dialog/select_images.php b/src/admin/dialog/select_images.php index bdbcc8ad..b0809283 100644 --- a/src/admin/dialog/select_images.php +++ b/src/admin/dialog/select_images.php @@ -84,7 +84,7 @@ if (!empty($iseditor)) {
选择图片
-
+
+ $line = "
返回上级 当前目录：$activepath
"; @@ -121,8 +121,8 @@ if (!empty($iseditor)) { $line = "
- $file + $file
"; echo "$line"; } else if (preg_match("#\.(".$cfg_imgtype.")#i", $file)) { @@ -138,8 +138,8 @@ if (!empty($iseditor)) { $line = "
- $file + $file
"; echo "$line"; } else if (preg_match("#\.(jpg)#i", $file)) { @@ -155,8 +155,8 @@ if (!empty($iseditor)) { $line = "
- $file + $file
"; echo "$line"; } diff --git a/src/admin/dialog/select_media.php b/src/admin/dialog/select_media.php index 8ec02153..3dbc40eb 100644 --- a/src/admin/dialog/select_media.php +++ b/src/admin/dialog/select_media.php @@ -103,15 +103,15 @@ if (!empty($noeditor)) { if ($activepath == "") continue; $tmp = preg_replace("#[\/][^\/]*$#i", "", $activepath); $line = " - 返回上级 - 当前目录：$activepath + 返回上级 + 当前目录：$activepath "; echo $line; } else if (is_dir("$inpath/$file")) { if (preg_match("#^_(.*)$#i", $file)) continue; if (preg_match("#^\.(.*)$#i", $file)) continue; $line = " - $file + $file "; echo "$line"; } else if (preg_match("#\.(swf|fly|fla|flv)#i", $file)) { @@ -125,9 +125,9 @@ if (!empty($noeditor)) { if ($file == $comeback) $lstyle = "class='text-danger'"; else $lstyle = ''; $line = " - $file - $filesize KB - $filetime + $file + $filesize KB + $filetime "; echo "$line"; } else if (preg_match("#\.(wmv|avi)#i", $file)) { @@ -141,9 +141,9 @@ if (!empty($noeditor)) { if ($file == $comeback) $lstyle = "class='text-danger'"; else $lstyle = ''; $line = " - $file - $filesize KB - $filetime + $file + $filesize KB + $filetime "; echo "$line"; } else if (preg_match("#\.(rm|rmvb|mp3|mp4)#i", $file)) { @@ -157,9 +157,9 @@ if (!empty($noeditor)) { if ($file == $comeback) $lstyle = "class='text-danger'"; else $lstyle = ''; $line = " - $file - $filesize KB - $filetime + $file + $filesize KB + $filetime "; echo "$line"; } else if (preg_match("#\.(mp3|wma)#", $file)) { @@ -173,9 +173,9 @@ if (!empty($noeditor)) { if ($file == $comeback) $lstyle = "class='text-danger'"; else $lstyle = ''; $line = " - $file - $filesize KB - $filetime + $file + $filesize KB + $filetime "; echo "$line"; } diff --git a/src/admin/dialog/select_soft.php b/src/admin/dialog/select_soft.php index 6b7f7085..e4b529ad 100644 --- a/src/admin/dialog/select_soft.php +++ b/src/admin/dialog/select_soft.php @@ -103,15 +103,15 @@ if (!empty($noeditor)) { if ($activepath == "") continue; $tmp = preg_replace("#[\/][^\/]*$#i", "", $activepath); $line = " - 返回上级 - 当前目录：$activepath + 返回上级 + 当前目录：$activepath \r\n"; echo $line; } else if (is_dir("$inpath/$file")) { if (preg_match("#^_(.*)$#i", $file)) continue; if (preg_match("#^\.(.*)$#i", $file)) continue; $line = " - $file + $file "; echo "$line"; } else if (preg_match("#\.(zip|rar|tgr.gz)#i", $file)) { @@ -125,9 +125,9 @@ if (!empty($noeditor)) { if ($file == $comeback) $lstyle = "class='text-danger'"; else $lstyle = ''; $line = " - $file - $filesize KB - $filetime + $file + $filesize KB + $filetime "; echo "$line"; } else { @@ -141,9 +141,9 @@ if (!empty($noeditor)) { if ($file == $comeback) $lstyle = "class='text-danger'"; else $lstyle = ''; $line = " - $file - $filesize KB - $filetime + $file + $filesize KB + $filetime "; echo "$line"; } diff --git a/src/admin/dialog/select_templets.php b/src/admin/dialog/select_templets.php index c7a0d4f0..a947888f 100644 --- a/src/admin/dialog/select_templets.php +++ b/src/admin/dialog/select_templets.php @@ -93,15 +93,15 @@ if (empty($comeback)) { if ($activepath == "") continue; $tmp = preg_replace("#[\/][^\/]*$#", "", $activepath); $line = " - 返回上级 - 当前目录：$activepath + 返回上级 + 当前目录：$activepath \r\n"; echo $line; } else if (is_dir("$inpath/$file")) { if (preg_match("#^_(.*)$#i", $file)) continue; if (preg_match("#^\.(.*)$#i", $file)) continue; $line = " - $file + $file "; echo "$line"; } else if (preg_match("#\.(htm|html)#i", $file)) { @@ -111,9 +111,9 @@ if (empty($comeback)) { if ($file == $comeback) $lstyle = "class='text-danger'"; else $lstyle = ''; $line = " - $file - $filesize KB - $filetime + $file + $filesize KB + $filetime "; echo "$line"; } else if (preg_match("#\.(css)#i", $file)) { @@ -123,9 +123,9 @@ if (empty($comeback)) { if ($file == $comeback) $lstyle = "class='text-danger'"; else $lstyle = ''; $line = " - $file - $filesize KB - $filetime + $file + $filesize KB + $filetime "; echo "$line"; } else if (preg_match("#\.(js)#i", $file)) { @@ -135,9 +135,9 @@ if (empty($comeback)) { if ($file == $comeback) $lstyle = "class='text-danger'"; else $lstyle = ''; $line = " - $file - $filesize KB - $filetime + $file + $filesize KB + $filetime "; echo "$line"; } else if (preg_match("#\.(jpg)#i", $file)) { @@ -147,9 +147,9 @@ if (empty($comeback)) { if ($file == $comeback) $lstyle = "class='text-danger'"; else $lstyle = ''; $line = " - $file - $filesize KB - $filetime + $file + $filesize KB + $filetime "; echo "$line"; } else if (preg_match("#\.(gif|png)#i", $file)) { @@ -159,9 +159,9 @@ if (empty($comeback)) { if ($file == $comeback) $lstyle = "class='text-danger'"; else $lstyle = ''; $line = " - $file - $filesize KB - $filetime + $file + $filesize KB + $filetime "; echo "$line"; } else if (preg_match("#\.(txt)#i", $file)) { @@ -171,9 +171,9 @@ if (empty($comeback)) { if ($file == $comeback) $lstyle = "class='text-danger'"; else $lstyle = ''; $line = " - $file - $filesize KB - $filetime"; + $file + $filesize KB + $filetime"; echo "$line"; } } diff --git a/src/admin/inc/inc_catalog_options.php b/src/admin/inc/inc_catalog_options.php index a7dee4f1..fea889c4 100644 --- a/src/admin/inc/inc_catalog_options.php +++ b/src/admin/inc/inc_catalog_options.php @@ -28,7 +28,7 @@ function GetOptionList($selid = 0, $userCatalog = 0, $channeltype = 0) //当前选中的栏目 if ($selid > 0) { $row = $dsql->GetOne("SELECT id,typename,ispart,channeltype FROM `#@__arctype` WHERE id='$selid'"); - if ($row['ispart'] == 1) $OptionArrayList .= ""; + if ($row['ispart'] == 1) $OptionArrayList .= ""; else $OptionArrayList .= ""; } //是否限定会员管理的栏目 @@ -60,16 +60,16 @@ function GetOptionList($selid = 0, $userCatalog = 0, $channeltype = 0) $sonCats = ''; LogicGetOptionArray($row->id, '─', $channeltype, $dsql, $sonCats); if ($sonCats != '') { - if ($row->ispart == 1) $OptionArrayList .= ""; - else if ($row->ispart == 2) $OptionArrayList .= ""; - else if (empty($channeltype) && $row->ispart != 0) $OptionArrayList .= ""; - else $OptionArrayList .= ""; + if ($row->ispart == 1) $OptionArrayList .= ""; + else if ($row->ispart == 2) $OptionArrayList .= ""; + else if (empty($channeltype) && $row->ispart != 0) $OptionArrayList .= ""; + else $OptionArrayList .= ""; $OptionArrayList .= $sonCats; } else { if ($row->ispart == 0 && (!empty($channeltype) && $row->channeltype == $channeltype)) { - $OptionArrayList .= ""; + $OptionArrayList .= ""; } else if ($row->ispart == 0 && empty($channeltype)) { - $OptionArrayList .= ""; + $OptionArrayList .= ""; } } } @@ -85,9 +85,9 @@ function LogicGetOptionArray($id, $step, $channeltype, &$dsql, &$sonCats) continue; } if ($row->channeltype == $channeltype && $row->ispart == 1) { - $sonCats .= ""; + $sonCats .= ""; } else if (($row->channeltype == $channeltype && $row->ispart == 0) || empty($channeltype)) { - $sonCats .= ""; + $sonCats .= ""; } LogicGetOptionArray($row->id, $step.'─', $channeltype, $dsql, $sonCats); } diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css index d9d6aefd..977efc78 100644 --- a/src/static/web/css/admin.css +++ b/src/static/web/css/admin.css @@ -434,14 +434,11 @@ body.menu-show .admin-content { word-wrap:break-word } .atlas { - float:left; - margin-right:1rem; - margin-bottom:1rem; - width:220px; + display:inline-block; + padding:0.5rem; + width:12.5%; height:auto; - background:var(--bg); - text-align:center; - border-radius:var(--b-radius) + text-align:center } .atlas .atlas-head { padding-bottom:75%; @@ -453,14 +450,13 @@ body.menu-show .admin-content { left:0; width:100%; height:100%; - object-fit:cover; - border-radius:var(--b-radius) var(--b-radius) 0 0 + object-fit:cover } -.atlas .atlas-head,.atlas .atlas-body,.atlas .atlas-foot { +.atlas .atlas-head,.atlas .atlas-body { margin-bottom:0.5rem } .atlas .atlas-input { - max-width:200px + width:100% } #toolimg { position:absolute; @@ -569,34 +565,39 @@ body.menu-show .admin-content { .column:hover { background:rgba(0,0,0,0.075) } -.opt .list { +.opt-img .list { display:inline-block; - margin-right:1rem; - margin-bottom:1rem; padding:0.5rem; - width:165px; - background:var(--light); + width:20%; text-align:center } -.opt .list img { +.opt-img .list a { display:block; - margin:0 auto 1rem; - max-width:149px; - max-height:84px + margin-bottom:0.5rem; + padding-bottom:75%; + position:relative +} +.opt-img .list a > img { + position:absolute; + top:0; + left:0; + width:100%; + height:100%; + object-fit:cover } -.opt .list span { +.opt-img .list span { display:block; overflow:hidden; text-overflow:ellipsis; white-space:nowrap } -.opt-ion1 { +.opt-bg1 { background:var(--gray-300) } -.opt-ion2 { +.opt-bg2 { background:var(--gray-500) } -.opt-ion3 { +.opt-bg3 { background:var(--white) } .opt-button { @@ -714,7 +715,7 @@ span.page-link { color:var(--white); background:var(--green) } -input,select,textarea,button,.colordlg,.pubdlg,.quickselitem .topcat,.mysource,.mywriter,.opt .list,#edsta,.cke_chrome,.cke_inner,.card,.form-control,.btn,.alert,.rounded { +input,select,textarea,button,.colordlg,.pubdlg,.quickselitem .topcat,.mysource,.mywriter,#edsta,.cke_chrome,.cke_inner,.card,.form-control,.btn,.alert,.rounded { border-radius:var(--b-radius)!important } .cke_top { diff --git a/src/system/typelink/typelink.class.php b/src/system/typelink/typelink.class.php index b1e03645..62acb82f 100755 --- a/src/system/typelink/typelink.class.php +++ b/src/system/typelink/typelink.class.php @@ -171,7 +171,7 @@ class TypeLink $row = $this->dsql->GetOne("SELECT id,typename,ispart,channeltype FROM `#@__arctype` WHERE id='$hid'"); $channeltype = $row['channeltype']; if ($row['ispart'] == 1) { - $this->OptionArrayList .= "\r\n"; + $this->OptionArrayList .= "\r\n"; } else { $this->OptionArrayList .= "\r\n"; } @@ -205,7 +205,7 @@ class TypeLink while ($row = $this->dsql->GetObject()) { if ($row->id != $hid) { if ($row->ispart == 1) { - $this->OptionArrayList .= "\r\n"; + $this->OptionArrayList .= "\r\n"; } else { $this->OptionArrayList .= "\r\n"; } @@ -234,7 +234,7 @@ class TypeLink if (!in_array($row->id, $oper)) continue; } if ($row->ispart == 1) { - $this->OptionArrayList .= "\r\n"; + $this->OptionArrayList .= "\r\n"; } else { $this->OptionArrayList .= "\r\n"; }