diff --git a/src/admin/templets/catalog_main.htm b/src/admin/templets/catalog_main.htm
index 22bf6e45..f121261c 100644
--- a/src/admin/templets/catalog_main.htm
+++ b/src/admin/templets/catalog_main.htm
@@ -129,12 +129,12 @@ td,th{padding:.25rem}
- | 提示：可使用右键菜单进行操作 |
+ 温馨提示（使用鼠标右键弹出菜单） |
- 展开全部
+ 展开栏目
- 普通模式
+ 收缩栏目
|
diff --git a/src/system/typelink/typeunit.class.admin.php b/src/system/typelink/typeunit.class.admin.php
index 4383dfb1..e2ba480d 100755
--- a/src/system/typelink/typeunit.class.admin.php
+++ b/src/system/typelink/typeunit.class.admin.php
@@ -10,7 +10,6 @@ if (!defined('DEDEINC')) exit('dedebiz');
* @link https://www.dedebiz.com
*/
require_once(DEDEINC."/channelunit.func.php");
-
/**
* 栏目单元,主要用户管理后台管理处
*
@@ -27,7 +26,6 @@ class TypeUnit
var $idArrary;
var $shortName;
var $CatalogNums;
-
//php5构造函数
function __construct()
{
@@ -38,17 +36,14 @@ class TypeUnit
$this->idArrary = '';
$this->dsql = 0;
}
-
function TypeUnit()
{
$this->__construct();
}
-
//清理类
function Close()
{
}
-
//获取所有栏目的文档ID数
function UpdateCatalogNum()
{
@@ -58,7 +53,6 @@ class TypeUnit
$this->CatalogNums[$row['typeid']] = $row['dd'];
}
}
-
function GetTotalArc($tid)
{
if (!is_array($this->CatalogNums)) {
@@ -77,7 +71,6 @@ class TypeUnit
return $totalnum;
}
}
-
/**
* 读出所有分类,在类目管理页(list_type)中使用
*
@@ -90,7 +83,6 @@ class TypeUnit
{
global $cfg_admin_channel, $admin_catalogs;
$this->dsql = $GLOBALS['dsql'];
-
//检测用户有权限的顶级栏目
if ($cfg_admin_channel == 'array') {
$admin_catalog = join(',', $admin_catalogs);
@@ -105,7 +97,6 @@ class TypeUnit
$admin_catalogs = explode(',', $admin_catalog);
$admin_catalogs = array_unique($admin_catalogs);
}
-
$this->dsql->SetQuery("SELECT id,typedir,typename,ispart,sortrank,ishidden FROM `#@__arctype` WHERE reid=0 order by sortrank");
$this->dsql->Execute(0);
while ($row = $this->dsql->GetObject(0)) {
@@ -122,58 +113,57 @@ class TypeUnit
} else {
$nss = '';
}
- echo "\r\n";
+ echo "";
//普通列表
if ($ispart == 0) {
- echo " \r\n";
- echo "  | \r\n";
- echo " | \r\n";
+ echo "";
+ echo " | ";
+ echo " | ";
}
//带封面的频道
else if ($ispart == 1) {
- echo " \r\n";
- echo " | \r\n";
- echo " | \r\n";
+ echo "";
+ echo " | ";
+ echo " | ";
}
//独立页面
else if ($ispart == 2) {
- echo " \r\n";
- echo " | \r\n";
- echo " | \r\n";
+ echo "";
+ echo " | ";
+ echo " | ";
}
- echo " | ";
+ echo " | ";
$lastid = GetCookie('lastCid');
if ($channel == $id || $lastid == $id || isset($GLOBALS['exallct']) || $cfg_admin_channel == 'array') {
- echo " \r\n";
+ echo "";
$this->LogicListAllSunType($id, " ");
- echo " \r\n";
+ echo " ";
}
- echo " | \r\n \r\n";
+ echo " ";
}
}
-
/**
* 获得子类目的递归调用
*
@@ -209,59 +199,55 @@ class TypeUnit
} else {
$nss = '';
}
-
//普通列表
if ($ispart == 0) {
- echo "\r\n";
+ echo " ";
echo "| ";
echo " | \r\n";
+ echo "";
+ echo "";
+ echo "";
+ echo "";
+ echo "";
+ echo "";
+ echo " | ";
}
-
//封面频道
else if ($ispart == 1) {
- echo " \r\n";
+ echo "
";
echo " |
\r\n";
+ echo "";
+ echo "";
+ echo "";
+ echo "";
+ echo "";
+ echo "";
+ echo " ";
}
-
//独立页面
else if ($ispart == 2) {
- echo "\r\n";
+ echo "
";
echo " |
\r\n";
+ echo "";
+ echo "";
+ echo "";
+ echo "";
+ echo " ";
}
- echo " ";
+ echo "";
$this->LogicListAllSunType($id, $step." ");
- echo " | \r\n";
+ echo " |
";
}
}
}
-
/**
* 返回与某个目相关的下级目录的类目ID列表(删除类目或文章时调用)
*
@@ -283,17 +269,12 @@ class TypeUnit
}
$this->dsql->SetQuery("SELECT id FROM `#@__arctype` WHERE reid=$id $csql");
$this->dsql->Execute("gs".$fid);
-
- //if($this->dsql->GetTotalRow("gs".$fid)!=0)
- //{
while ($row = $this->dsql->GetObject("gs".$fid)) {
$nid = $row->id;
$this->GetSunTypes($nid, $channel);
}
- //}
return $this->idArray;
}
-
/**
* 删除类目
*
@@ -323,7 +304,6 @@ class TypeUnit
$addtable = $typeinfos['addtable'];
$ispart = $typeinfos['ispart'];
$defaultname = $typeinfos['defaultname'];
-
//删除数据库里的相关记录
foreach ($this->idArray as $id) {
$myrow = $this->dsql->GetOne("SELECT * FROM `#@__arctype` WHERE id='$id'");
@@ -337,7 +317,6 @@ class TypeUnit
}
}
}
-
//删除目录和目录里的所有文件 ### 禁止了此功能
//删除单独页面
if ($myrow['ispart'] == 2 && $myrow['typedir'] == '') {
@@ -345,7 +324,6 @@ class TypeUnit
@unlink($this->baseDir.'/'.$myrow['defaultname']);
}
}
-
//删除数据库信息
$this->dsql->ExecuteNoneQuery("DELETE FROM `#@__arctype` WHERE id='$id'");
$this->dsql->ExecuteNoneQuery("DELETE FROM `#@__arctiny` WHERE typeid='$id'");
@@ -356,7 +334,6 @@ class TypeUnit
$this->dsql->ExecuteNoneQuery("DELETE FROM $addtable WHERE typeid='$id'");
}
}
-
//删除目录和目录里的所有文件 ### 禁止了此功能
//删除单独页面
if ($ispart == 2 && $indir == "") {
@@ -368,7 +345,6 @@ class TypeUnit
$this->idCounter = 0;
return TRUE;
}
-
/**
* 删除指定目录的所有文件
*
";
+ echo "