DedeBIZ
/
DedeV6
Sledovat 2
Oblíbit 0
Rozštěpit 0
Zdrojový kód Požadavky na natažení 0 Vydání 25 Aktivita
Procházet zdrojové kódy

优化

develop
叙述、别离 před 1 měsícem
rodič
2ff9854801
revize
2609279e65
7 změnil soubory, kde provedl 88 přidání a 87 odebrání
Rozdělené zobrazení
Diff Options
Zobrazit statistiky Download Patch File Stáhněte rozdílový soubor
  1. +5
    -5
      src/admin/dialog/select_images.php
  2. +15
    -15
      src/admin/dialog/select_media.php
  3. +9
    -9
      src/admin/dialog/select_soft.php
  4. +21
    -21
      src/admin/dialog/select_templets.php
  5. +9
    -9
      src/admin/inc/inc_catalog_options.php
  6. +26
    -25
      src/static/web/css/admin.css
  7. +3
    -3
      src/system/typelink/typelink.class.php

+ 5
- 5
src/admin/dialog/select_images.php Zobrazit soubor

@@ -84,7 +84,7 @@ if (!empty($iseditor)) {
</div>
<div class="card shadow-sm">
<div class="card-header">选择图片</div>
<div class="card-body opt">
<div class="card-body opt-img">
<?php
$dh = scandir($inpath);
$ty1 = "";
@@ -110,7 +110,7 @@ if (!empty($iseditor)) {
else if ($file == "..") {
if ($activepath == "") continue;
$tmp = preg_replace("#[\/][^\/]*$#i", "", $activepath);
$line = "<div class='d-flex justify-content-between mb-3'>
$line = "<div class='d-flex justify-content-between align-items-center mb-3'>
<a href='select_images.php?imgstick=$imgstick&v=$v&f=$f&activepath=".urlencode($tmp).$addparm."' class='btn btn-success btn-sm'>返回上级</a>
<span>当前目录：$activepath</span>
</div>";
@@ -121,8 +121,8 @@ if (!empty($iseditor)) {
$line = "<div class='list'>
<a href='select_images.php?imgstick=$imgstick&v=$v&f=$f&activepath=".urlencode("$activepath/$file").$addparm."'>
<img src='/static/web/img/icon_dir.png'>
<span>$file</span>
</a>
<span>$file</span>
</div>";
echo "$line";
} else if (preg_match("#\.(".$cfg_imgtype.")#i", $file)) {
@@ -138,8 +138,8 @@ if (!empty($iseditor)) {
$line = "<div class='list'>
<a href='$reurl' onclick=\"ReturnImg('$reurl');\" $lstyle>
<img src='$reurl' title='$file'>
<span>$file</span>
</a>
<span>$file</span>
</div>";
echo "$line";
} else if (preg_match("#\.(jpg)#i", $file)) {
@@ -155,8 +155,8 @@ if (!empty($iseditor)) {
$line = "<div class='list'>
<a href='$reurl' onclick=\"ReturnImg('$reurl');\" $lstyle>
<img src='$reurl' title='$file'>
<span>$file</span>
</a>
<span>$file</span>
</div>";
echo "$line";
}


+ 15
- 15
src/admin/dialog/select_media.php Zobrazit soubor

@@ -103,15 +103,15 @@ if (!empty($noeditor)) {
if ($activepath == "") continue;
$tmp = preg_replace("#[\/][^\/]*$#i", "", $activepath);
$line = "<tr>
<td><a href='select_media.php?f=$f&activepath=".urlencode($tmp).$addparm."'><img src='/static/web/img/icon_dir2.png'> 返回上级</a></td>
<td colspan='2'>当前目录：$activepath</td>
<td><a href='select_media.php?f=$f&activepath=".urlencode($tmp).$addparm."'><img src='/static/web/img/icon_dir2.png'> 返回上级</a></td>
<td colspan='2'>当前目录：$activepath</td>
</tr>";
echo $line;
} else if (is_dir("$inpath/$file")) {
if (preg_match("#^_(.*)$#i", $file)) continue;
if (preg_match("#^\.(.*)$#i", $file)) continue;
$line = "<tr>
<td colspan='3'><a href=select_media.php?f=$f&activepath=".urlencode("$activepath/$file").$addparm."><img src='/static/web/img/icon_dir.png'> $file</a></td>
<td colspan='3'><a href=select_media.php?f=$f&activepath=".urlencode("$activepath/$file").$addparm."><img src='/static/web/img/icon_dir.png'> $file</a></td>
</tr>";
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 = "<tr>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_flash.png'> $file</a></td>
<td>$filesize KB</td>
<td align='center'>$filetime</td>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_flash.png'> $file</a></td>
<td>$filesize KB</td>
<td align='center'>$filetime</td>
</tr>";
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 = "<tr>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_video.png'> $file</a></td>
<td>$filesize KB</td>
<td align='center'>$filetime</td>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_video.png'> $file</a></td>
<td>$filesize KB</td>
<td align='center'>$filetime</td>
</tr>";
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 = "<tr>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_rm.png'> $file</a></td>
<td>$filesize KB</td>
<td align='center'>$filetime</td>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_rm.png'> $file</a></td>
<td>$filesize KB</td>
<td align='center'>$filetime</td>
</tr>";
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 = "<tr>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_music.png'> $file</a></td>
<td>$filesize KB</td>
<td align='center'>$filetime</td>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_music.png'> $file</a></td>
<td>$filesize KB</td>
<td align='center'>$filetime</td>
</tr>";
echo "$line";
}


+ 9
- 9
src/admin/dialog/select_soft.php Zobrazit soubor

@@ -103,15 +103,15 @@ if (!empty($noeditor)) {
if ($activepath == "") continue;
$tmp = preg_replace("#[\/][^\/]*$#i", "", $activepath);
$line = "<tr>
<td><a href='select_soft.php?f=$f&activepath=".urlencode($tmp).$addparm."'><img src='/static/web/img/icon_dir2.png'> 返回上级</a></td>
<td colspan='2'>当前目录：$activepath</td>
<td><a href='select_soft.php?f=$f&activepath=".urlencode($tmp).$addparm."'><img src='/static/web/img/icon_dir2.png'> 返回上级</a></td>
<td colspan='2'>当前目录：$activepath</td>
</tr>\r\n";
echo $line;
} else if (is_dir("$inpath/$file")) {
if (preg_match("#^_(.*)$#i", $file)) continue;
if (preg_match("#^\.(.*)$#i", $file)) continue;
$line = "<tr>
<td colspan='3'><a href=select_soft.php?f=$f&activepath=".urlencode("$activepath/$file").$addparm."><img src='/static/web/img/icon_dir.png'> $file</a></td>
<td colspan='3'><a href=select_soft.php?f=$f&activepath=".urlencode("$activepath/$file").$addparm."><img src='/static/web/img/icon_dir.png'> $file</a></td>
</tr>";
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 = "<tr>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_zip.png'> $file</a></td>
<td>$filesize KB</td>
<td>$filetime</td>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_zip.png'> $file</a></td>
<td>$filesize KB</td>
<td>$filetime</td>
</tr>";
echo "$line";
} else {
@@ -141,9 +141,9 @@ if (!empty($noeditor)) {
if ($file == $comeback) $lstyle = "class='text-danger'";
else $lstyle = '';
$line = "<tr>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_exe.png'> $file</a></td>
<td>$filesize KB</td>
<td>$filetime</td>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_exe.png'> $file</a></td>
<td>$filesize KB</td>
<td>$filetime</td>
</tr>";
echo "$line";
}


+ 21
- 21
src/admin/dialog/select_templets.php Zobrazit soubor

@@ -93,15 +93,15 @@ if (empty($comeback)) {
if ($activepath == "") continue;
$tmp = preg_replace("#[\/][^\/]*$#", "", $activepath);
$line = "<tr>
<td><a href='select_templets.php?f=$f&activepath=".urlencode($tmp)."'><img src='/static/web/img/icon_dir2.png'> 返回上级</a></td>
<td colspan='2'>当前目录：$activepath</td>
<td><a href='select_templets.php?f=$f&activepath=".urlencode($tmp)."'><img src='/static/web/img/icon_dir2.png'> 返回上级</a></td>
<td colspan='2'>当前目录：$activepath</td>
</tr>\r\n";
echo $line;
} else if (is_dir("$inpath/$file")) {
if (preg_match("#^_(.*)$#i", $file)) continue;
if (preg_match("#^\.(.*)$#i", $file)) continue;
$line = "<tr>
<td colspan='3'><a href=select_templets.php?f=$f&activepath=".urlencode("$activepath/$file")."><img src='/static/web/img/icon_dir.png'> $file</a></td>
<td colspan='3'><a href=select_templets.php?f=$f&activepath=".urlencode("$activepath/$file")."><img src='/static/web/img/icon_dir.png'> $file</a></td>
</tr>";
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 = "<tr>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_htm.png'> $file</a></td>
<td>$filesize KB</td>
<td>$filetime</td>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_htm.png'> $file</a></td>
<td>$filesize KB</td>
<td>$filetime</td>
</tr>";
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 = "<tr>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_css.png'> $file</a></td>
<td>$filesize KB</td>
<td>$filetime</td>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_css.png'> $file</a></td>
<td>$filesize KB</td>
<td>$filetime</td>
</tr>";
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 = "<tr>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_js.png'> $file</a></td>
<td>$filesize KB</td>
<td>$filetime</td>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_js.png'> $file</a></td>
<td>$filesize KB</td>
<td>$filetime</td>
</tr>";
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 = "<tr>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='$reurl'> $file</a></td>
<td>$filesize KB</td>
<td>$filetime</td>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='$reurl'> $file</a></td>
<td>$filesize KB</td>
<td>$filetime</td>
</tr>";
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 = "<tr>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='$reurl'> $file</a></td>
<td>$filesize KB</td>
<td>$filetime</td>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='$reurl'> $file</a></td>
<td>$filesize KB</td>
<td>$filetime</td>
</tr>";
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 = "<tr>
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_text.png'> $file</a></td>
<td>$filesize KB</td>
<td>$filetime</td></tr>";
<td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_text.png'> $file</a></td>
<td>$filesize KB</td>
<td>$filetime</td></tr>";
echo "$line";
}
}


+ 9
- 9
src/admin/inc/inc_catalog_options.php Zobrazit soubor

@@ -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 .= "<option value='".$row['id']."' class='opt-ion1' selected='selected'>".$row['typename']."(封面栏目)</option>";
if ($row['ispart'] == 1) $OptionArrayList .= "<option value='".$row['id']."' class='opt-bg1' selected='selected'>".$row['typename']."(封面栏目)</option>";
else $OptionArrayList .= "<option value='".$row['id']."' selected='selected'>".$row['typename']."</option>";
}
//是否限定会员管理的栏目
@@ -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 .= "<option value='".$row->id."' class='opt-ion1'>".$row->typename." - 封面栏目</option>";
else if ($row->ispart == 2) $OptionArrayList .= "<option value='".$row->id."' class='opt-ion1'>".$row->typename." - 外部栏目</option>";
else if (empty($channeltype) && $row->ispart != 0) $OptionArrayList .= "<option value='".$row->id."' class='opt-ion2'>".$row->typename."-".$channels[$row->channeltype]."</option>";
else $OptionArrayList .= "<option value='".$row->id."' class='opt-ion3'>".$row->typename."</option>";
if ($row->ispart == 1) $OptionArrayList .= "<option value='".$row->id."' class='opt-bg1'>".$row->typename." - 封面栏目</option>";
else if ($row->ispart == 2) $OptionArrayList .= "<option value='".$row->id."' class='opt-bg1'>".$row->typename." - 外部栏目</option>";
else if (empty($channeltype) && $row->ispart != 0) $OptionArrayList .= "<option value='".$row->id."' class='opt-bg2'>".$row->typename."-".$channels[$row->channeltype]."</option>";
else $OptionArrayList .= "<option value='".$row->id."' class='opt-bg3'>".$row->typename."</option>";
$OptionArrayList .= $sonCats;
} else {
if ($row->ispart == 0 && (!empty($channeltype) && $row->channeltype == $channeltype)) {
$OptionArrayList .= "<option value='".$row->id."' class='opt-ion3'>".$row->typename."</option>";
$OptionArrayList .= "<option value='".$row->id."' class='opt-bg3'>".$row->typename."</option>";
} else if ($row->ispart == 0 && empty($channeltype)) {
$OptionArrayList .= "<option value='".$row->id."' class='opt-ion3'>".$row->typename."</option>";
$OptionArrayList .= "<option value='".$row->id."' class='opt-bg3'>".$row->typename."</option>";
}
}
}
@@ -85,9 +85,9 @@ function LogicGetOptionArray($id, $step, $channeltype, &$dsql, &$sonCats)
continue;
}
if ($row->channeltype == $channeltype && $row->ispart == 1) {
$sonCats .= "<option value='".$row->id."' class='opt-ion1'>└$step ".$row->typename."</option>";
$sonCats .= "<option value='".$row->id."' class='opt-bg1'>└$step ".$row->typename."</option>";
} else if (($row->channeltype == $channeltype && $row->ispart == 0) || empty($channeltype)) {
$sonCats .= "<option value='".$row->id."' class='opt-ion3'>└$step ".$row->typename."</option>";
$sonCats .= "<option value='".$row->id."' class='opt-bg3'>└$step ".$row->typename."</option>";
}
LogicGetOptionArray($row->id, $step.'─', $channeltype, $dsql, $sonCats);
}


+ 26
- 25
src/static/web/css/admin.css Zobrazit soubor

@@ -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 {


+ 3
- 3
src/system/typelink/typelink.class.php Zobrazit soubor

@@ -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 .= "<option value='".$row['id']."' class='opt-ion1' selected>".$row['typename']."</option>\r\n";
$this->OptionArrayList .= "<option value='".$row['id']."' class='opt-bg1' selected>".$row['typename']."</option>\r\n";
} else {
$this->OptionArrayList .= "<option value='".$row['id']."' selected>".$row['typename']."</option>\r\n";
}
@@ -205,7 +205,7 @@ class TypeLink
while ($row = $this->dsql->GetObject()) {
if ($row->id != $hid) {
if ($row->ispart == 1) {
$this->OptionArrayList .= "<option value='".$row->id."' class='opt-ion1'>".$row->typename."</option>\r\n";
$this->OptionArrayList .= "<option value='".$row->id."' class='opt-bg1'>".$row->typename."</option>\r\n";
} else {
$this->OptionArrayList .= "<option value='".$row->id."'>".$row->typename."</option>\r\n";
}
@@ -234,7 +234,7 @@ class TypeLink
if (!in_array($row->id, $oper)) continue;
}
if ($row->ispart == 1) {
$this->OptionArrayList .= "<option value='".$row->id."' class='opt-ion1'>└$step ".$row->typename."</option>\r\n";
$this->OptionArrayList .= "<option value='".$row->id."' class='opt-bg1'>└$step ".$row->typename."</option>\r\n";
} else {
$this->OptionArrayList .= "<option value='".$row->id."'>└$step ".$row->typename."</option>\r\n";
}


Zapsat Náhled
Načítá se…
Zrušit
Uložit