From 2d9209d67d01e720e47cbc103b2971314e216dec Mon Sep 17 00:00:00 2001 From: xushubieli Date: Tue, 1 Nov 2022 15:38:45 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E8=B5=84=E6=BA=90=EF=BC=8C?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=8F=9C=E5=8D=95=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=88=90=E5=8D=95=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/css/menu.min.css | 2 +- src/admin/inc/inc_menu.php | 24 +-- src/admin/inc/inc_menu_func.php | 27 +-- src/admin/inc/inc_menu_module.php | 18 +- src/admin/index_menu_load.php | 25 --- src/admin/js/leftmenu.js | 129 ------------- .../templets/article_description_main.htm | 4 +- src/admin/templets/index_body.htm | 7 +- src/admin/templets/index_menu.htm | 70 +++---- src/admin/templets/login.htm | 62 +++---- src/admin/templets/makehtml_archives.htm | 4 +- src/admin/templets/makehtml_freelist.htm | 4 +- src/admin/templets/makehtml_taglist.htm | 4 +- src/admin/templets/member_scores.htm | 4 +- src/admin/templets/tags_main.htm | 47 +++-- src/install/install.html | 171 +++++++++--------- src/static/ckeditor/skins/kama/dialog.css | 5 - src/static/ckeditor/skins/kama/dialog_ie.css | 5 - src/static/ckeditor/skins/kama/dialog_ie7.css | 5 - src/static/ckeditor/skins/kama/dialog_ie8.css | 5 - .../ckeditor/skins/kama/dialog_iequirks.css | 5 - src/static/ckeditor/skins/kama/editor.css | 5 - src/static/ckeditor/skins/kama/editor_ie.css | 5 - src/static/ckeditor/skins/kama/editor_ie7.css | 5 - src/static/ckeditor/skins/kama/editor_ie8.css | 5 - .../ckeditor/skins/kama/editor_iequirks.css | 5 - src/static/ckeditor/skins/kama/icons.png | Bin 10177 -> 0 bytes .../ckeditor/skins/kama/icons_hidpi.png | Bin 15767 -> 0 bytes .../skins/kama/images/dialog_sides.gif | Bin 47 -> 0 bytes .../skins/kama/images/dialog_sides.png | Bin 125 -> 0 bytes .../skins/kama/images/dialog_sides_rtl.png | Bin 128 -> 0 bytes .../ckeditor/skins/kama/images/mini.gif | Bin 181 -> 0 bytes .../ckeditor/skins/kama/images/spinner.gif | Bin 2984 -> 0 bytes .../ckeditor/skins/kama/images/sprites.png | Bin 6117 -> 0 bytes .../skins/kama/images/sprites_ie6.png | Bin 2658 -> 0 bytes .../skins/kama/images/toolbar_start.gif | Bin 102 -> 0 bytes src/static/ckeditor/skins/kama/readme.md | 38 ---- src/static/ckeditor/skins/kama/skin.js | 8 - src/static/ckeditor/skins/moono/dialog.css | 5 - src/static/ckeditor/skins/moono/dialog_ie.css | 5 - .../ckeditor/skins/moono/dialog_ie7.css | 5 - .../ckeditor/skins/moono/dialog_ie8.css | 5 - .../ckeditor/skins/moono/dialog_iequirks.css | 5 - src/static/ckeditor/skins/moono/editor.css | 5 - .../ckeditor/skins/moono/editor_gecko.css | 5 - src/static/ckeditor/skins/moono/editor_ie.css | 5 - .../ckeditor/skins/moono/editor_ie7.css | 5 - .../ckeditor/skins/moono/editor_ie8.css | 5 - .../ckeditor/skins/moono/editor_iequirks.css | 5 - src/static/ckeditor/skins/moono/icons.png | Bin 18909 -> 0 bytes .../ckeditor/skins/moono/icons_hidpi.png | Bin 54148 -> 0 bytes .../ckeditor/skins/moono/images/anchor.png | Bin 929 -> 0 bytes .../ckeditor/skins/moono/images/arrow.png | Bin 191 -> 0 bytes .../ckeditor/skins/moono/images/close.png | Bin 869 -> 0 bytes .../skins/moono/images/hidpi/anchor.png | Bin 1510 -> 0 bytes .../skins/moono/images/hidpi/close.png | Bin 1732 -> 0 bytes .../skins/moono/images/hidpi/lock-open.png | Bin 1582 -> 0 bytes .../skins/moono/images/hidpi/lock.png | Bin 1644 -> 0 bytes .../skins/moono/images/hidpi/refresh.png | Bin 2311 -> 0 bytes .../ckeditor/skins/moono/images/lock-open.png | Bin 801 -> 0 bytes .../ckeditor/skins/moono/images/lock.png | Bin 849 -> 0 bytes .../ckeditor/skins/moono/images/refresh.png | Bin 1050 -> 0 bytes .../ckeditor/skins/moono/images/spinner.gif | Bin 2984 -> 0 bytes src/static/ckeditor/skins/moono/readme.md | 49 ----- src/static/ckeditor/skins/moono/skin.js | 10 - src/static/web/css/admin.css | 5 + src/system/archive/listview.class.php | 81 ++++----- src/system/archive/taglist.class.php | 10 +- src/system/common.func.php | 100 +++++----- src/system/common.inc.php | 2 +- src/system/dedecollection.func.php | 4 +- 71 files changed, 294 insertions(+), 720 deletions(-) delete mode 100644 src/admin/index_menu_load.php delete mode 100644 src/admin/js/leftmenu.js delete mode 100644 src/static/ckeditor/skins/kama/dialog.css delete mode 100644 src/static/ckeditor/skins/kama/dialog_ie.css delete mode 100644 src/static/ckeditor/skins/kama/dialog_ie7.css delete mode 100644 src/static/ckeditor/skins/kama/dialog_ie8.css delete mode 100644 src/static/ckeditor/skins/kama/dialog_iequirks.css delete mode 100644 src/static/ckeditor/skins/kama/editor.css delete mode 100644 src/static/ckeditor/skins/kama/editor_ie.css delete mode 100644 src/static/ckeditor/skins/kama/editor_ie7.css delete mode 100644 src/static/ckeditor/skins/kama/editor_ie8.css delete mode 100644 src/static/ckeditor/skins/kama/editor_iequirks.css delete mode 100644 src/static/ckeditor/skins/kama/icons.png delete mode 100644 src/static/ckeditor/skins/kama/icons_hidpi.png delete mode 100644 src/static/ckeditor/skins/kama/images/dialog_sides.gif delete mode 100644 src/static/ckeditor/skins/kama/images/dialog_sides.png delete mode 100644 src/static/ckeditor/skins/kama/images/dialog_sides_rtl.png delete mode 100644 src/static/ckeditor/skins/kama/images/mini.gif delete mode 100644 src/static/ckeditor/skins/kama/images/spinner.gif delete mode 100644 src/static/ckeditor/skins/kama/images/sprites.png delete mode 100644 src/static/ckeditor/skins/kama/images/sprites_ie6.png delete mode 100644 src/static/ckeditor/skins/kama/images/toolbar_start.gif delete mode 100644 src/static/ckeditor/skins/kama/readme.md delete mode 100644 src/static/ckeditor/skins/kama/skin.js delete mode 100644 src/static/ckeditor/skins/moono/dialog.css delete mode 100644 src/static/ckeditor/skins/moono/dialog_ie.css delete mode 100644 src/static/ckeditor/skins/moono/dialog_ie7.css delete mode 100644 src/static/ckeditor/skins/moono/dialog_ie8.css delete mode 100644 src/static/ckeditor/skins/moono/dialog_iequirks.css delete mode 100644 src/static/ckeditor/skins/moono/editor.css delete mode 100644 src/static/ckeditor/skins/moono/editor_gecko.css delete mode 100644 src/static/ckeditor/skins/moono/editor_ie.css delete mode 100644 src/static/ckeditor/skins/moono/editor_ie7.css delete mode 100644 src/static/ckeditor/skins/moono/editor_ie8.css delete mode 100644 src/static/ckeditor/skins/moono/editor_iequirks.css delete mode 100644 src/static/ckeditor/skins/moono/icons.png delete mode 100644 src/static/ckeditor/skins/moono/icons_hidpi.png delete mode 100644 src/static/ckeditor/skins/moono/images/anchor.png delete mode 100644 src/static/ckeditor/skins/moono/images/arrow.png delete mode 100644 src/static/ckeditor/skins/moono/images/close.png delete mode 100644 src/static/ckeditor/skins/moono/images/hidpi/anchor.png delete mode 100644 src/static/ckeditor/skins/moono/images/hidpi/close.png delete mode 100644 src/static/ckeditor/skins/moono/images/hidpi/lock-open.png delete mode 100644 src/static/ckeditor/skins/moono/images/hidpi/lock.png delete mode 100644 src/static/ckeditor/skins/moono/images/hidpi/refresh.png delete mode 100644 src/static/ckeditor/skins/moono/images/lock-open.png delete mode 100644 src/static/ckeditor/skins/moono/images/lock.png delete mode 100644 src/static/ckeditor/skins/moono/images/refresh.png delete mode 100644 src/static/ckeditor/skins/moono/images/spinner.gif delete mode 100644 src/static/ckeditor/skins/moono/readme.md delete mode 100644 src/static/ckeditor/skins/moono/skin.js diff --git a/src/admin/css/menu.min.css b/src/admin/css/menu.min.css index b118b635..2d859235 100644 --- a/src/admin/css/menu.min.css +++ b/src/admin/css/menu.min.css @@ -1 +1 @@ -.menu-body{margin:0;padding:0 10px}.menu-left{padding-top:1rem}.menu-right{width:100%;background:#fff;box-shadow:0 0.125rem 0.25rem rgba(0,0,0,.075);border-radius:0 0 .2rem .2rem}a.menu-item div{margin-bottom:5px;width:40px;height:28px;line-height:28px;color:#545b62;background:#fff;box-shadow:0 0.125rem 0.25rem rgba(0,0,0,.075);border-radius:.2rem 0 0 .2rem;text-align:center;transition:all .3s;cursor:pointer}a.menu-item div:hover{color:#fff;background:#545b62}a.menu-active div{margin-bottom:5px;width:40px;height:28px;line-height:28px;color:#fff;background:#545b62;box-shadow:0 0.125rem 0.25rem rgba(0,0,0,.075);border-radius:.2rem 0 0 .2rem;text-align:center}dl.bitem{margin:1rem 0 10px 0;padding:0 10px}dl.bitem dt{margin-bottom:10px;padding-left:10px;height:28px;line-height:28px;background:#f6f6f6;border-radius:.2rem;cursor:pointer}dl.bitem dt b{color:#545b62}dl.bitem dt b i{margin-right:10px;width:10px}.sitemu li{display:block;padding-left:30px;height:26px;line-height:26px}.fllct{float:left}.flrct{float:right}.fa-minus-circle{color:#dc3545}.fa-plus-circle{color:#28a745}#browsehappy{padding:20px 30px;font-size:14px;line-height:16px;color:#856404;background:#fff3cd;border-radius:.25rem;border:0}.browsehappy-close{float:right;cursor:pointer} \ No newline at end of file +.menu-box{margin:0;padding:1rem 5px;background:#ffff}.menu{width:100%;background:#fff;border-radius:.2rem;box-shadow:0 .125rem .25rem rgba(0,0,0,.075)}.menu .link{position:relative;padding-left:50px;display:block;height:40px;line-height:40px;cursor:pointer;transition:all .3s}.menu li:last-child .link{border-bottom:0}.menu li i{position:absolute;top:12px;left:20px;color:#545b62}.menu li i.fa-angle-down{right:20px;left:auto}.menu li.open .link,.menu li.open i{color:#28a745}.menu li.open i.fa-angle-down{transform:rotate(180deg)}.submenu{display:none;padding:5px 0;background:#adb5bd;border-radius:0 0 .2rem .2rem}.submenu li{height:40px;line-height:40px;transition:all .3s}.submenu li:hover{background:#28a745}.submenu a{float:left;display:block;padding:0 10px 0 50px;color:#fff}.submenu-right{float:right!important;padding:0 20px 0 10px!important} \ No newline at end of file diff --git a/src/admin/inc/inc_menu.php b/src/admin/inc/inc_menu.php index 43f115af..ab01151a 100644 --- a/src/admin/inc/inc_menu.php +++ b/src/admin/inc/inc_menu.php @@ -9,6 +9,7 @@ * @link https://www.dedebiz.com */ require_once(dirname(__FILE__)."/../config.php"); +require_once(dirname(__FILE__)."/inc_menu_module.php"); //载入可发布频道 $addset = ''; //检测可用的内容模型 @@ -34,21 +35,21 @@ $gitUrl = DEDEBIZURL."/git"; $dedebizUrl = DEDEBIZURL; $adminMenu1 = $adminMenu2 = ''; if ($cuserLogin->getUserType() >= 10) { - $adminMenu1 = (DEDEBIZ_SAFE_MODE? "" : " + $adminMenu1 = (DEDEBIZ_SAFE_MODE? "" : " ")." - + "; - $adminMenu2 = " + $adminMenu2 = " @@ -57,7 +58,7 @@ if ($cuserLogin->getUserType() >= 10) { - + @@ -73,7 +74,7 @@ if ($cuserLogin->getUserType() >= 10) { "; } -$menusMain = " +$menusMain = " @@ -81,17 +82,17 @@ $menusMain = " - + $addset - + $adminMenu1 - + @@ -100,7 +101,8 @@ $adminMenu1 ".(DEDEBIZ_SAFE_MODE? "" : "")." - +{$GLOBALS['menusMoudle']} + @@ -109,14 +111,14 @@ $adminMenu1 - + $adminMenu2 - + "; diff --git a/src/admin/inc/inc_menu_func.php b/src/admin/inc/inc_menu_func.php index 2857df5d..bdd32712 100644 --- a/src/admin/inc/inc_menu_func.php +++ b/src/admin/inc/inc_menu_func.php @@ -10,8 +10,8 @@ */ require_once(dirname(__FILE__)."/../config.php"); require_once(DEDEINC."/dedetag.class.php"); -$headTemplet = "
~channelname~
    "; -$footTemplet = "
"; +$headTemplet = '
  • ~channelname~
      '; +$footTemplet = "
    • "; $itemTemplet = "
  • ~link~
    • "; function GetMenus($userrank, $topos = 'main') { @@ -28,22 +28,15 @@ function GetMenus($userrank, $topos = 'main') $dtp->LoadSource($menus); $dtp2 = new DedeTagParse(); $dtp2->SetNameSpace('m', '<', '>'); - $m = 0; foreach ($dtp->CTags as $i => $ctag) { if ($ctag->GetName() == 'top' && ($ctag->GetAtt('rank') == '' || TestPurview($ctag->GetAtt('rank')))) { if ($openitem != 999 && !preg_match("#".$openitem.'_'."#", $ctag->GetAtt('item')) && $openitem != 100) continue; - $m++; - echo ""; $htmp = str_replace("~channelname~", $ctag->GetAtt("name"), $headTemplet); - if (empty($openitem) || $openitem == 100) { - if ($ctag->GetAtt('notshowall') == '1') continue; - $htmp = str_replace('~display~', $ctag->GetAtt('display'), $htmp); - } else { - if ($openitem == $ctag->GetAtt('item') || preg_match("#".$openitem.'_'."#", $ctag->GetAtt('item')) || $openitem == '-1') - $htmp = str_replace('~display~', 'block', $htmp); - else - $htmp = str_replace('~display~', 'none', $htmp); + $icon = 'fa-desktop'; + if ($ctag->GetAtt('icon') != '') { + $icon = $ctag->GetAtt('icon'); } + $htmp = str_replace('~icon~', $icon, $htmp); $htmp = str_replace('~cc~', $m.'_'.$openitem, $htmp); echo $htmp; $dtp2->LoadSource($ctag->InnerText); @@ -52,17 +45,12 @@ function GetMenus($userrank, $topos = 'main') if ($ctag2->GetName() == 'item' && ($ctag2->GetAtt('rank') == '' || TestPurview($ctag2->GetAtt('rank')))) { $link = "".$ctag2->GetAtt('name').""; if ($ischannel == '1') { - if ($ctag2->GetAtt('addalt') != '') { - $addalt = $ctag2->GetAtt('addalt'); - } else { - $addalt = '录入新内容'; - } if ($ctag2->GetAtt('addico') != '') { $addico = $ctag2->GetAtt('addico'); } else { $addico = 'fa-plus-circle'; } - $link = "
    $link
    "; + $link = "$link"; } else { $link .= ""; } @@ -71,7 +59,6 @@ function GetMenus($userrank, $topos = 'main') } } echo $footTemplet; - echo ""; } } }//End Function diff --git a/src/admin/inc/inc_menu_module.php b/src/admin/inc/inc_menu_module.php index 673eb02d..6f8e1596 100644 --- a/src/admin/inc/inc_menu_module.php +++ b/src/admin/inc/inc_menu_module.php @@ -2,22 +2,13 @@ /** * 模块菜单 * - * @version $Id: inc_menu_module.php 1 10:32 2010年7月21日 tianya $ + * @version $Id: inc_menu_module.php 1 10:32 2010年7月21日Z tianya $ * @package DedeBIZ.Administrator * @copyright Copyright (c) 2022, DedeBIZ.COM * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ require_once(dirname(__FILE__)."/../config.php"); -/* -模块菜单一般在不要直接改此文件，直接保存在#@__sys_module表即可，格式为 - - - - - -这个菜单可在生成模块时指定 -*/ //载入模块菜单 $moduleset = ''; $dsql->SetQuery("SELECT * FROM `#@__sys_module` ORDER BY id DESC"); @@ -35,7 +26,7 @@ while ($row = $dsql->GetObject()) { } $adminMenu = ''; if ($cuserLogin->getUserType() >= 10) { - $adminMenu = DEDEBIZ_SAFE_MODE? "" : " + $adminMenu = DEDEBIZ_SAFE_MODE? "" : " @@ -43,10 +34,9 @@ if ($cuserLogin->getUserType() >= 10) { } $menusMoudle = " $adminMenu - + $plusset $moduleset -"; -?> \ No newline at end of file +"; \ No newline at end of file diff --git a/src/admin/index_menu_load.php b/src/admin/index_menu_load.php deleted file mode 100644 index 50150131..00000000 --- a/src/admin/index_menu_load.php +++ /dev/null @@ -1,25 +0,0 @@ -getUserRank(), 'main'); - exit(); -} else { - $openitem = 0; - require(dirname(__FILE__).'/inc/inc_menu_module.php'); - require(DEDEADMIN.'/inc/inc_menu_func.php'); - GetMenus($cuserLogin->getUserRank(), 'module'); - exit(); -} -?> \ No newline at end of file diff --git a/src/admin/js/leftmenu.js b/src/admin/js/leftmenu.js deleted file mode 100644 index d1ae7b58..00000000 --- a/src/admin/js/leftmenu.js +++ /dev/null @@ -1,129 +0,0 @@ -function showHide(objname, o) -{ - //只对主菜单设置cookie - var obj = document.getElementById(objname); - var objsun = document.getElementById('sun'+objname); - if(objname.indexOf('_1')<0 || objname.indexOf('_10')>0) - { - if(obj.style.display == 'block' || obj.style.display =='') - { - obj.style.display = 'none'; - o.querySelector("i").className = "fa fa-angle-right" - } else { - obj.style.display = 'block'; - o.querySelector("i").className = "fa fa-angle-down" - } - return true; - } - //正常设置cookie - var ckstr = getCookie('menuitems'); - var ckstrs = null; - var okstr =''; - var ischange = false; - if(ckstr==null) ckstr = ''; - ckstrs = ckstr.split(','); - objname = objname.replace('items',''); - if(obj.style.display == 'block' || obj.style.display =='') - { - obj.style.display = 'none'; - for(var i=0; i < ckstrs.length; i++) - { - if(ckstrs[i]=='') continue; - if(ckstrs[i]==objname){ ischange = true; } - else okstr += (okstr=='' ? ckstrs[i] : ','+ckstrs[i] ); - } - o.querySelector("i").className = "fa fa-angle-right" - } else { - obj.style.display = 'block'; - ischange = true; - for(var i=0; i < ckstrs.length; i++) - { - if(ckstrs[i]==objname) { ischange = false; break; } - } - if(ischange) - { - ckstr = (ckstr==null ? objname : ckstr+','+objname); - setCookie('menuitems',ckstr,7); - } - o.querySelector("i").className = "fa fa-angle-down" - } -} -//读写cookie函数 -function getCookie(c_name) -{ - if (document.cookie.length > 0) - { - c_start = document.cookie.indexOf(c_name + "=") - if (c_start != -1) - { - c_start = c_start + c_name.length + 1; - c_end = document.cookie.indexOf(";",c_start); - if (c_end == -1) - { - c_end = document.cookie.length; - } - return unescape(document.cookie.substring(c_start,c_end)); - } - } - return null -} -function setCookie(c_name,value,expiredays) -{ - var exdate = new Date(); - exdate.setDate(exdate.getDate() + expiredays); - document.cookie = c_name + "=" +escape(value) + ((expiredays == null) ? "" : ";expires=" + exdate.toGMTString()); //使设置的有效时间正确。增加toGMTString() -} -//检查以前用户展开的菜单项 -var totalitem = 12; -function CheckOpenMenu() -{ - var ckstr = getCookie('menuitems'); - var curitem = ''; - var curobj = null; - if(ckstr==null) - { - ckstr='1_1,2_1,3_1'; - setCookie('menuitems',ckstr,7); - } - ckstr = ','+ckstr+','; - for(i=0;i 0 && curobj != null) - { - curobj.style.display = 'block'; - } else { - if(curobj != null) curobj.style.display = 'none'; - } - } -} -var curitem = 1; -function ShowMainMenu(n) -{ - var curLink = $DE('link'+curitem); - var targetLink = $DE('link'+n); - var curCt = $DE('ct'+curitem); - var targetCt = $DE('ct'+n); - if(curitem==n) return false; - if(targetCt.innerHTML!='') - { - curCt.style.display = 'none'; - targetCt.style.display = 'block'; - curLink.className = 'menu-item'; - targetLink.className = 'menu-active'; - curitem = n; - } else { - fetch("index_menu_load.php?openitem="+n).then(resp=>resp.text()).then((d)=>{ - targetCt.innerHTML = d; - if(targetCt.innerHTML!='') - { - curCt.style.display = 'none'; - targetCt.style.display = 'block'; - curLink.className = 'menu-item'; - targetLink.className = 'menu-active'; - curitem = n; - } - }); - } -} \ No newline at end of file diff --git a/src/admin/templets/article_description_main.htm b/src/admin/templets/article_description_main.htm index 9be5c140..f4141025 100644 --- a/src/admin/templets/article_description_main.htm +++ b/src/admin/templets/article_description_main.htm @@ -34,8 +34,8 @@ - 开始ID： - 结束ID： + 开始id： + 结束id： diff --git a/src/admin/templets/index_body.htm b/src/admin/templets/index_body.htm index 104aaed6..ce1c3514 100644 --- a/src/admin/templets/index_body.htm +++ b/src/admin/templets/index_body.htm @@ -63,8 +63,7 @@
    -
    - 系统信息 +
    系统信息 软件：|操作系统：|Web服务器：|PHP：|数据库：GetVersion();?>
    @@ -116,7 +115,9 @@
    -
    流量统计图
    +
    + 流量统计图 +
    diff --git a/src/admin/templets/index_menu.htm b/src/admin/templets/index_menu.htm index 3f3ccae4..08219154 100644 --- a/src/admin/templets/index_menu.htm +++ b/src/admin/templets/index_menu.htm @@ -7,53 +7,35 @@ - var curopenItem = '$openitem';";?> - - - - - - - - - -
    - -
    运维
    -     - -
    插件
    -     - -
    更新
    -     - -
    会员
    -     - getUserType()>=10){?> - -
    模板
    -     - -
    系统
    -     - -     		-
    getUserRank(),'main');?>
    -
    -
    -
    -
    -
    -
    -
    -
    - + + - \ No newline at end of file diff --git a/src/admin/templets/login.htm b/src/admin/templets/login.htm index 41e61fa9..b78ea4ed 100644 --- a/src/admin/templets/login.htm +++ b/src/admin/templets/login.htm @@ -20,42 +20,42 @@
    -
    - -
    -
    - 网站首页 -
    +
    +
    网站首页
    -