diff --git a/src/admin/dialog/select_templets.php b/src/admin/dialog/select_templets.php
index ba1bd4a4..65476551 100644
--- a/src/admin/dialog/select_templets.php
+++ b/src/admin/dialog/select_templets.php
@@ -35,153 +35,151 @@ if (empty($comeback)) {
-
-
-
-
-
-
-
-
-
-
-
-
- 文件名称
- 文件大小
- 修改时间
-
-
-
-
- 上级目录
- 当前目录:$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
- ";
- echo "$line";
- } else if (preg_match("#\.(htm|html)#i", $file)) {
- if ($file == $comeback) $lstyle = "class='text-danger'";
- else $lstyle = '';
- $reurl = "$activeurl/$file";
- $reurl = preg_replace("#\.\.#", "", $reurl);
- $reurl = preg_replace("#".$templetdir."\/#", "", $reurl);
- $line = "
- $file
- $filesize KB
- $filetime
- ";
- echo "$line";
- } else if (preg_match("#\.(css)#i", $file)) {
- if ($file == $comeback) $lstyle = "class='text-danger'";
- else $lstyle = '';
- $reurl = "$activeurl/$file";
- $reurl = preg_replace("#\.\.#", "", $reurl);
- $reurl = preg_replace("#".$templetdir."/#", "", $reurl);
- $line = "
- $file
- $filesize KB
- $filetime
- ";
- echo "$line";
- } else if (preg_match("#\.(js)#i", $file)) {
- if ($file == $comeback) $lstyle = "class='text-danger'";
- else $lstyle = '';
- $reurl = "$activeurl/$file";
- $reurl = preg_replace("#\.\.#", "", $reurl);
- $reurl = preg_replace("#".$templetdir."\/#", "", $reurl);
- $line = "
- $file
- $filesize KB
- $filetime
- ";
- echo "$line";
- } else if (preg_match("#\.(jpg)#i", $file)) {
- if ($file == $comeback) $lstyle = "class='text-danger'";
- else $lstyle = '';
- $reurl = "$activeurl/$file";
- $reurl = preg_replace("#\.\.#", "", $reurl);
- $reurl = preg_replace("#".$templetdir."\/#", "", $reurl);
- $line = "
- $file
- $filesize KB
- $filetime
- ";
- echo "$line";
- } else if (preg_match("#\.(gif|png)#i", $file)) {
- if ($file == $comeback) $lstyle = "class='text-danger'";
- else $lstyle = '';
- $reurl = "$activeurl/$file";
- $reurl = preg_replace("#\.\.#", "", $reurl);
- $reurl = preg_replace("#".$templetdir."\/#", "", $reurl);
- $line = "
- $file
- $filesize KB
- $filetime
- ";
- echo "$line";
- } else if (preg_match("#\.(txt)#i", $file)) {
- if ($file == $comeback) $lstyle = "class='text-danger'";
- else $lstyle = '';
- $reurl = "$activeurl/$file";
- $reurl = preg_replace("#\.\.#", "", $reurl);
- $reurl = preg_replace("#".$templetdir."\/#", "", $reurl);
- $line = "
- $file
- $filesize KB
- $filetime ";
- echo "$line";
+
+
+
+
+
+
+
+
+
+ 文件名称
+ 文件大小
+ 修改时间
+
+
+
+
+ 上级目录
+ 当前目录:$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
+ ";
+ echo "$line";
+ } else if (preg_match("#\.(htm|html)#i", $file)) {
+ if ($file == $comeback) $lstyle = "class='text-danger'";
+ else $lstyle = '';
+ $reurl = "$activeurl/$file";
+ $reurl = preg_replace("#\.\.#", "", $reurl);
+ $reurl = preg_replace("#".$templetdir."\/#", "", $reurl);
+ $line = "
+ $file
+ $filesize KB
+ $filetime
+ ";
+ echo "$line";
+ } else if (preg_match("#\.(css)#i", $file)) {
+ if ($file == $comeback) $lstyle = "class='text-danger'";
+ else $lstyle = '';
+ $reurl = "$activeurl/$file";
+ $reurl = preg_replace("#\.\.#", "", $reurl);
+ $reurl = preg_replace("#".$templetdir."/#", "", $reurl);
+ $line = "
+ $file
+ $filesize KB
+ $filetime
+ ";
+ echo "$line";
+ } else if (preg_match("#\.(js)#i", $file)) {
+ if ($file == $comeback) $lstyle = "class='text-danger'";
+ else $lstyle = '';
+ $reurl = "$activeurl/$file";
+ $reurl = preg_replace("#\.\.#", "", $reurl);
+ $reurl = preg_replace("#".$templetdir."\/#", "", $reurl);
+ $line = "
+ $file
+ $filesize KB
+ $filetime
+ ";
+ echo "$line";
+ } else if (preg_match("#\.(jpg)#i", $file)) {
+ if ($file == $comeback) $lstyle = "class='text-danger'";
+ else $lstyle = '';
+ $reurl = "$activeurl/$file";
+ $reurl = preg_replace("#\.\.#", "", $reurl);
+ $reurl = preg_replace("#".$templetdir."\/#", "", $reurl);
+ $line = "
+ $file
+ $filesize KB
+ $filetime
+ ";
+ echo "$line";
+ } else if (preg_match("#\.(gif|png)#i", $file)) {
+ if ($file == $comeback) $lstyle = "class='text-danger'";
+ else $lstyle = '';
+ $reurl = "$activeurl/$file";
+ $reurl = preg_replace("#\.\.#", "", $reurl);
+ $reurl = preg_replace("#".$templetdir."\/#", "", $reurl);
+ $line = "
+ $file
+ $filesize KB
+ $filetime
+ ";
+ echo "$line";
+ } else if (preg_match("#\.(txt)#i", $file)) {
+ if ($file == $comeback) $lstyle = "class='text-danger'";
+ else $lstyle = '';
+ $reurl = "$activeurl/$file";
+ $reurl = preg_replace("#\.\.#", "", $reurl);
+ $reurl = preg_replace("#".$templetdir."\/#", "", $reurl);
+ $line = "
+ $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 6db2088b..a7dee4f1 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 .= "
".$row['typename']."(封面栏目) ";
+ if ($row['ispart'] == 1) $OptionArrayList .= "
".$row['typename']."(封面栏目) ";
else $OptionArrayList .= "
".$row['typename']." ";
}
//是否限定会员管理的栏目
@@ -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 .= "
".$row->typename." - 封面栏目 ";
- else if ($row->ispart == 2) $OptionArrayList .= "
".$row->typename." - 外部栏目 ";
- else if (empty($channeltype) && $row->ispart != 0) $OptionArrayList .= "
".$row->typename."-".$channels[$row->channeltype]." ";
- else $OptionArrayList .= "
".$row->typename." ";
+ if ($row->ispart == 1) $OptionArrayList .= "
".$row->typename." - 封面栏目 ";
+ else if ($row->ispart == 2) $OptionArrayList .= "
".$row->typename." - 外部栏目 ";
+ else if (empty($channeltype) && $row->ispart != 0) $OptionArrayList .= "
".$row->typename."-".$channels[$row->channeltype]." ";
+ else $OptionArrayList .= "
".$row->typename." ";
$OptionArrayList .= $sonCats;
} else {
if ($row->ispart == 0 && (!empty($channeltype) && $row->channeltype == $channeltype)) {
- $OptionArrayList .= "
".$row->typename." ";
+ $OptionArrayList .= "
".$row->typename." ";
} else if ($row->ispart == 0 && empty($channeltype)) {
- $OptionArrayList .= "
".$row->typename." ";
+ $OptionArrayList .= "
".$row->typename." ";
}
}
}
@@ -85,9 +85,9 @@ function LogicGetOptionArray($id, $step, $channeltype, &$dsql, &$sonCats)
continue;
}
if ($row->channeltype == $channeltype && $row->ispart == 1) {
- $sonCats .= "
└$step ".$row->typename." ";
+ $sonCats .= "
└$step ".$row->typename." ";
} else if (($row->channeltype == $channeltype && $row->ispart == 0) || empty($channeltype)) {
- $sonCats .= "
└$step ".$row->typename." ";
+ $sonCats .= "
└$step ".$row->typename." ";
}
LogicGetOptionArray($row->id, $step.'─', $channeltype, $dsql, $sonCats);
}
diff --git a/src/admin/templets/album_add.htm b/src/admin/templets/album_add.htm
index d0f51e97..3c62def5 100644
--- a/src/admin/templets/album_add.htm
+++ b/src/admin/templets/album_add.htm
@@ -75,7 +75,7 @@
远程图片
- 上传
+ 上传
选择
清空
@@ -163,7 +163,7 @@
本地上传
- 上传多图
+ 上传多图
diff --git a/src/admin/templets/album_edit.htm b/src/admin/templets/album_edit.htm
index f159e20b..8dc6a095 100644
--- a/src/admin/templets/album_edit.htm
+++ b/src/admin/templets/album_edit.htm
@@ -76,7 +76,7 @@
远程图片
- 上传
+ 上传
选择
清空
@@ -182,7 +182,7 @@
$fhtml .= " ";
$fhtml .= "";
$fhtml .= "
";
- $fhtml .= "";
+ $fhtml .= "";
$fhtml .= "";
echo $fhtml;
$j++;
@@ -197,7 +197,7 @@
本地上传
- 上传多图
+ 上传多图
diff --git a/src/admin/templets/archives_add.htm b/src/admin/templets/archives_add.htm
index 25dfe792..f7722349 100644
--- a/src/admin/templets/archives_add.htm
+++ b/src/admin/templets/archives_add.htm
@@ -71,7 +71,7 @@
远程图片
- 上传
+ 上传
选择
清空
diff --git a/src/admin/templets/archives_edit.htm b/src/admin/templets/archives_edit.htm
index 2787179d..495a77f2 100644
--- a/src/admin/templets/archives_edit.htm
+++ b/src/admin/templets/archives_edit.htm
@@ -72,7 +72,7 @@
远程图片
- 上传
+ 上传
选择
清空
diff --git a/src/admin/templets/archives_sg_add.htm b/src/admin/templets/archives_sg_add.htm
index 5fe0aac3..517daa09 100644
--- a/src/admin/templets/archives_sg_add.htm
+++ b/src/admin/templets/archives_sg_add.htm
@@ -58,7 +58,7 @@
远程图片
- 上传
+ 上传
选择
清空
diff --git a/src/admin/templets/archives_sg_edit.htm b/src/admin/templets/archives_sg_edit.htm
index e9971788..b5c8fc5f 100644
--- a/src/admin/templets/archives_sg_edit.htm
+++ b/src/admin/templets/archives_sg_edit.htm
@@ -62,7 +62,7 @@
远程图片
- 上传
+ 上传
选择
清空
diff --git a/src/admin/templets/article_add.htm b/src/admin/templets/article_add.htm
index 4b72b0c7..06940de0 100644
--- a/src/admin/templets/article_add.htm
+++ b/src/admin/templets/article_add.htm
@@ -70,7 +70,7 @@
远程图片
- 上传
+ 上传
选择
清空
diff --git a/src/admin/templets/article_edit.htm b/src/admin/templets/article_edit.htm
index a5fd54a8..9d03e388 100644
--- a/src/admin/templets/article_edit.htm
+++ b/src/admin/templets/article_edit.htm
@@ -77,7 +77,7 @@
远程图片
- 上传
+ 上传
选择
清空
diff --git a/src/admin/templets/soft_add.htm b/src/admin/templets/soft_add.htm
index a35e5e4e..227ca7eb 100644
--- a/src/admin/templets/soft_add.htm
+++ b/src/admin/templets/soft_add.htm
@@ -87,7 +87,7 @@
远程图片
- 上传
+ 上传
选择
清空
diff --git a/src/admin/templets/soft_edit.htm b/src/admin/templets/soft_edit.htm
index 01a17f34..6d3cfeda 100644
--- a/src/admin/templets/soft_edit.htm
+++ b/src/admin/templets/soft_edit.htm
@@ -88,7 +88,7 @@
远程图片
- 上传
+ 上传
选择
清空
diff --git a/src/admin/templets/spec_add.htm b/src/admin/templets/spec_add.htm
index f8841078..e8859e38 100644
--- a/src/admin/templets/spec_add.htm
+++ b/src/admin/templets/spec_add.htm
@@ -99,7 +99,7 @@
远程图片
- 上传
+ 上传
选择
清空
diff --git a/src/admin/templets/spec_edit.htm b/src/admin/templets/spec_edit.htm
index 290eefbf..1e065b30 100644
--- a/src/admin/templets/spec_edit.htm
+++ b/src/admin/templets/spec_edit.htm
@@ -98,7 +98,7 @@
远程图片
- 上传
+ 上传
选择
清空
diff --git a/src/admin/templets/stepselect_main.htm b/src/admin/templets/stepselect_main.htm
index 935d23d3..6d5726d0 100644
--- a/src/admin/templets/stepselect_main.htm
+++ b/src/admin/templets/stepselect_main.htm
@@ -187,27 +187,27 @@
if ($topvalue % 500 != 0) $arr['issign'] = 2;
?>
+
-
-
-
-
-
选择
id
diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css
index cb7e41b6..4260e677 100644
--- a/src/static/web/css/admin.css
+++ b/src/static/web/css/admin.css
@@ -587,10 +587,6 @@ body.menu-show .body-right {
display:flex;
flex-wrap:wrap
}
-.upload-bg {
- margin:1rem;
- background:var(--white)
-}
.w-65 {
width:65%
}
@@ -625,6 +621,10 @@ body.menu-show .body-right {
margin-bottom:0;
color:var(--gray)
}
+.table.icon img {
+ width:20px;
+ height:20px
+}
.table th,.table td {
padding:0.5rem 1rem 0.5rem 0;
vertical-align:middle
@@ -636,25 +636,42 @@ body.menu-show .body-right {
font-size:14px!important;
color:inherit
}
-.icon img {
- width:20px;
- height:20px
+.opt .list {
+ display:inline-block;
+ margin-right:1rem;
+ margin-bottom:1rem;
+ padding:1rem;
+ width:134px;
+ background:var(--light);
+ text-align:center
+}
+.opt .list img {
+ display:block;
+ margin:0 auto 1rem;
+ max-width:89px;
+ max-height:50px
+}
+.opt .list span {
+ display:block;
+ overflow:hidden;
+ text-overflow:ellipsis;
+ white-space:nowrap
}
-.option1 {
+.opt-ion1 {
background:var(--gray-300)
}
-.option2 {
+.opt-ion2 {
background:var(--gray-500)
}
-.option3 {
+.opt-ion3 {
background:var(--white)
}
-.fileinput-button {
+.opt-button {
display:inline-block;
position:relative;
overflow:hidden
}
-.fileinput-button input {
+.opt-button input {
position:absolute;
top:0;
right:0;
@@ -724,7 +741,7 @@ span.page-link {
color:var(--white);
background:var(--green)
}
-input,select,textarea,.upload-bg,.colordlg,.pubdlg,.quickselitem .topcat,.mysource,.mywriter,#edsta,.cke_chrome,.cke_inner,.pagination,.card,.form-control,.btn,.alert,.rounded {
+input,select,textarea,.upload-bg,.colordlg,.pubdlg,.quickselitem .topcat,.mysource,.mywriter,.opt .list,#edsta,.cke_chrome,.cke_inner,.pagination,.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 8229980a..b1e03645 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 .= "".$row['typename']." \r\n";
+ $this->OptionArrayList .= "".$row['typename']." \r\n";
} else {
$this->OptionArrayList .= "".$row['typename']." \r\n";
}
@@ -205,7 +205,7 @@ class TypeLink
while ($row = $this->dsql->GetObject()) {
if ($row->id != $hid) {
if ($row->ispart == 1) {
- $this->OptionArrayList .= "".$row->typename." \r\n";
+ $this->OptionArrayList .= "".$row->typename." \r\n";
} else {
$this->OptionArrayList .= "".$row->typename." \r\n";
}
@@ -234,7 +234,7 @@ class TypeLink
if (!in_array($row->id, $oper)) continue;
}
if ($row->ispart == 1) {
- $this->OptionArrayList .= "└$step ".$row->typename." \r\n";
+ $this->OptionArrayList .= "└$step ".$row->typename." \r\n";
} else {
$this->OptionArrayList .= "└$step ".$row->typename." \r\n";
}