diff --git a/src/admin/templets/album_add.htm b/src/admin/templets/album_add.htm index fbc95d6a..32ef4d55 100644 --- a/src/admin/templets/album_add.htm +++ b/src/admin/templets/album_add.htm @@ -266,9 +266,7 @@ - - - + diff --git a/src/admin/templets/album_edit.htm b/src/admin/templets/album_edit.htm index 44bad55f..5b6b9570 100644 --- a/src/admin/templets/album_edit.htm +++ b/src/admin/templets/album_edit.htm @@ -194,9 +194,7 @@ - - - + - - - + - - - + diff --git a/src/admin/templets/article_edit.htm b/src/admin/templets/article_edit.htm index 4c6590a2..acf2d1b0 100644 --- a/src/admin/templets/article_edit.htm +++ b/src/admin/templets/article_edit.htm @@ -193,9 +193,7 @@
diff --git a/src/admin/templets/archives_add.htm b/src/admin/templets/archives_add.htm index d3153cec..ebd8356a 100644 --- a/src/admin/templets/archives_add.htm +++ b/src/admin/templets/archives_add.htm @@ -221,9 +221,7 @@
diff --git a/src/admin/templets/archives_edit.htm b/src/admin/templets/archives_edit.htm index cc002c16..c0ee579f 100644 --- a/src/admin/templets/archives_edit.htm +++ b/src/admin/templets/archives_edit.htm @@ -195,9 +195,7 @@ - - - + - - - + - - - +
diff --git a/src/admin/templets/archives_sg_add.htm b/src/admin/templets/archives_sg_add.htm index ad07f126..9d837875 100644 --- a/src/admin/templets/archives_sg_add.htm +++ b/src/admin/templets/archives_sg_add.htm @@ -134,9 +134,7 @@
diff --git a/src/admin/templets/archives_sg_edit.htm b/src/admin/templets/archives_sg_edit.htm index a58f531c..24160a02 100644 --- a/src/admin/templets/archives_sg_edit.htm +++ b/src/admin/templets/archives_sg_edit.htm @@ -133,9 +133,7 @@
diff --git a/src/admin/templets/article_add.htm b/src/admin/templets/article_add.htm index 356169e4..1693df86 100644 --- a/src/admin/templets/article_add.htm +++ b/src/admin/templets/article_add.htm @@ -229,9 +229,7 @@
- - - + diff --git a/src/admin/templets/soft_add.htm b/src/admin/templets/soft_add.htm index df9baaf5..7ca1abbe 100644 --- a/src/admin/templets/soft_add.htm +++ b/src/admin/templets/soft_add.htm @@ -325,9 +325,7 @@
- - - + diff --git a/src/admin/templets/soft_edit.htm b/src/admin/templets/soft_edit.htm index 6c613114..f71a0618 100644 --- a/src/admin/templets/soft_edit.htm +++ b/src/admin/templets/soft_edit.htm @@ -320,9 +320,7 @@
- - - + diff --git a/src/admin/templets/spec_add.htm b/src/admin/templets/spec_add.htm index 8ebd65cb..051df572 100644 --- a/src/admin/templets/spec_add.htm +++ b/src/admin/templets/spec_add.htm @@ -173,9 +173,7 @@
- - - + diff --git a/src/admin/templets/spec_edit.htm b/src/admin/templets/spec_edit.htm index cfe0e8c1..4bc04040 100644 --- a/src/admin/templets/spec_edit.htm +++ b/src/admin/templets/spec_edit.htm @@ -175,9 +175,7 @@
- - - + diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css index 11b15b6b..d821b575 100644 --- a/src/static/web/css/admin.css +++ b/src/static/web/css/admin.css @@ -243,8 +243,8 @@ body.hidemenu .body-right { margin-left:5px } .top-item ul li { - position:relative; float:left; + position:relative; padding-left:30px; height:60px; line-height:60px @@ -269,8 +269,8 @@ body.hidemenu .body-right { } .search-input { width:160px; - height:26px; - line-height:26px; + height:28px; + line-height:28px; font-size:12px; background:#fff; border:0 @@ -373,6 +373,7 @@ body.hidemenu .body-right { } .coolbg2 { height:28px; + line-height:28px; background:#dfddd2; border:1px solid #dee2e6 } @@ -392,6 +393,7 @@ body.hidemenu .body-right { .coolbg3 { width:140px; height:28px; + line-height:28px; background:#dfddd2; border:1px solid #bdc5b4; text-align:right @@ -432,7 +434,8 @@ body.hidemenu .body-right { } .pubdlg .title { padding-left:.65rem; - line-height:30px; + height:28px; + line-height:28px; font-weight:600; color:#545b62; background:#f5f5f5; @@ -546,14 +549,19 @@ body.hidemenu .body-right { } .admin-win { background:#f5f5f5; - border:1px solid #dee2e6 + border:1px solid #dee2e6!important } .admin-win-iframe { width:100%; height:360px } .admin-border { - border:1px solid #dee2e6 + border:1px solid #dee2e6!important +} +.admin-main-sort { + margin-left:1rem; + width:30px; + text-align:center } .admin-td { padding:.65rem; @@ -565,7 +573,7 @@ body.hidemenu .body-right { } .admin-textarea-sm { width:360px; - height:50px + height:60px } .admin-input-lg { width:380px diff --git a/src/static/web/css/style.css b/src/static/web/css/style.css index 02b425bc..69499cec 100644 --- a/src/static/web/css/style.css +++ b/src/static/web/css/style.css @@ -34,7 +34,7 @@ ul,ol,li { } h1,h2,h3,h4,h5,h6 { margin:0; - line-height:1.5; + line-height:1.6; font-weight:600; color:#393d49 } diff --git a/src/system/typelink/typeunit.class.admin.php b/src/system/typelink/typeunit.class.admin.php index 988af3fd..2208db6d 100755 --- a/src/system/typelink/typeunit.class.admin.php +++ b/src/system/typelink/typeunit.class.admin.php @@ -65,7 +65,7 @@ class TypeUnit } } /** - * 读出所有分类,在栏目管理页list_type中使用 + * 读出所有分类，在栏目管理页list_type中使用 * * @access public * @param int $channel 栏目id @@ -108,42 +108,40 @@ class TypeUnit $nss = ''; } echo "
"; - //普通列表 if ($ispart == 0) { + //列表栏目 echo ""; echo ""; - } - //带封面的栏目 - else if ($ispart == 1) { + echo "
"; + echo "
列表{$nss}".$typeName."[id：".$id."]（文档数：".$this->GetTotalArc($id)."）"; - echo ""; - echo ""; + echo ""; echo ""; echo ""; echo ""; echo ""; echo ""; - echo "
"; + } else if ($ispart == 1) { + //封面栏目 echo ""; echo ""; + echo "
封面{$nss}".$typeName."[id：".$id."]"; - echo ""; - echo ""; + echo ""; echo ""; echo ""; echo ""; echo ""; echo ""; - echo "
"; - } - //独立页面 - else if ($ispart == 2) { + echo ""; + } else if ($ispart == 2) { + //外部栏目 echo ""; echo ""; + echo "
外部{$nss}".$typeName."[id：".$id."]"; - echo ""; - echo ""; + echo ""; echo ""; echo ""; echo ""; - echo "
"; + echo ""; } echo ""; $lastid = GetCookie('lastCid'); @@ -155,7 +153,7 @@ class TypeUnit echo ""; $i++; } if ($i === 0) { - echo "
暂无栏目，请添加栏目
"; + echo "
暂无栏目，请添加栏目
"; } } /** @@ -192,46 +190,43 @@ class TypeUnit $nss = "隐藏"; } else { $nss = ''; - } - //普通列表 - if ($ispart == 0) { + } if ($ispart == 0) { + //列表栏目 echo ""; echo ""; + echo "
"; echo "$step列表{$nss}".$typeName."[id：".$id."]（文档数：".$this->GetTotalArc($id)."）"; - echo ""; - echo ""; + echo ""; echo ""; echo ""; echo ""; echo ""; echo ""; - echo "
"; - } - //封面栏目 - else if ($ispart == 1) { + echo ""; + } else if ($ispart == 1) { + //封面栏目 echo ""; echo ""; + echo "
"; echo "$step封面{$nss}".$typeName."[id：".$id."]"; - echo ""; - echo ""; + echo ""; echo ""; echo ""; echo ""; echo ""; echo ""; - echo "
"; - } - //独立页面 - else if ($ispart == 2) { + echo ""; + } else if ($ispart == 2) { + //外部栏目 echo ""; echo ""; + echo "
"; echo "$step外部{$nss}".$typeName."[id：".$id."]"; - echo ""; - echo ""; + echo ""; echo ""; echo ""; echo ""; - echo "
"; + echo ""; } echo ""; $this->LogicListAllSunType($id, $step."　"); @@ -240,7 +235,7 @@ class TypeUnit } } /** - * 返回与某个目相关的下级目录的栏目id列表删除栏目或文档时调用 + * 返回某个相关下级目录的栏目id列表删除栏目或文档时调用 * * @access public * @param int $id 栏目id @@ -302,8 +297,7 @@ class TypeUnit } } } - //删除目录和目录里的所有文件 ### 禁止了此功能 - //删除单独页面 + //删除单独页面，删除目录和目录里的所有文件，禁止了此功能 if ($myrow['ispart'] == 2 && $myrow['typedir'] == '') { if (is_file($this->baseDir.'/'.$myrow['defaultname'])) { @unlink($this->baseDir.'/'.$myrow['defaultname']); @@ -319,8 +313,7 @@ class TypeUnit $this->dsql->ExecuteNoneQuery("DELETE FROM $addtable WHERE typeid='$id'"); } } - //删除目录和目录里的所有文件 ### 禁止了此功能 - //删除单独页面 + //删除单独页面，删除目录和目录里的所有文件，禁止了此功能 if ($ispart == 2 && $indir == "") { if (is_file($this->baseDir."/".$defaultname)) { @unlink($this->baseDir."/".$defaultname); diff --git a/src/theme/system/custom_fields_admin.htm b/src/theme/system/custom_fields_admin.htm index ae8e0c5d..c5bc164b 100644 --- a/src/theme/system/custom_fields_admin.htm +++ b/src/theme/system/custom_fields_admin.htm @@ -1,6 +1,10 @@ -
- - - - -
~name~：~form~
\ No newline at end of file + + + + + + + +
~name~：~form~
+ + \ No newline at end of file