diff --git a/src/admin/css/frame.css b/src/admin/css/frame.css index fa16ef59..e445cdb4 100644 --- a/src/admin/css/frame.css +++ b/src/admin/css/frame.css @@ -1 +1 @@ -*{margin:0;padding:0;letter-spacing:.4px;box-sizing:border-box}body{line-height:1.5;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#fff;overflow:hidden}body.hidemenu{background:none}a,a:hover{text-decoration:none}ul,li{list-style:none}input[type=text]{padding:.2rem;width:140px;height:20px;line-height:20px;font-size:12px;border-width:1px;border-style:solid;border-color:#fff;background:#fff;vertical-align:middle}input[type=text]:focus{box-shadow:none;outline:none}.head{position:relative;width:100%;height:90px;overflow:hidden;z-index:8}.top{width:100%;height:50px;background:linear-gradient(45deg,#008e38,#57960f 50%);overflow:hidden;clear:both}.top .top_logo{float:left;margin-left:30px}.top .top_dedebiz a{float:left;height:50px;line-height:50px;font-size:18px;font-weight:600;color:#fff}.top .top_version{float:left;margin-top:16px;margin-left:10px;color:#fff}.top .btn-primary{float:left;margin-top:14px;margin-left:10px;padding:2px;line-height:12px;font-size:12px;color:#fff}.top .btn-warning{float:left;margin-top:14px;margin-left:10px;padding:2px;line-height:12px;font-size:12px;color:#fff}.top .top_link{float:right;height:50px;line-height:50px;margin-right:30px}.top .top_link ul li.welcome img{margin-right:10px;width:30px;height:30px;border-radius:50%;vertical-align:middle}.top .top_link ul li{float:left}.top .top_link ul li a{padding-left:20px;color:#fff}.top .top_link ul li a:hover{color:#dee2e6}.topnav{width:100%;height:40px;line-height:40px;background:#424b51;overflow:hidden}.topnav .menuact{float:left;padding-left:30px;overflow:hidden}.topnav .menuact a{padding-right:10px;color:#dee2e6}.topnav .menuact a:hover{color:#fff}.sysmsg{float:right;padding-right:30px;overflow:hidden}.scroll a{padding-left:10px;color:#dee2e6}body.showmenu .left{display:block}body.hidemenu .left{display:none}body.showmenu .right{left:230px}body.hidemenu .right{left:0}.left{position:absolute;top:90px;width:230px;left:0;bottom:0;z-index:7}.menu{height:100%}.menu iframe{width:100%;height:100%;z-index:20}.right{position:absolute;right:0;top:90px;bottom:0;z-index:7}.main{height:100%}.main iframe{width:100%;height:100%;z-index:20}.qucikmenu{position:absolute;right:10px;top:30px;z-index:9;display:none}.qucikmenu ul{width:110px;background:#fff;border:1px solid #e6e6e6}.qucikmenu ul li{display:block;text-align:left}.qucikmenu ul li a{display:block;padding:0 10px;height:30px;line-height:30px;color:#424b51}.qucikmenu ul li a:hover{background:#f8f8f8}.pagemask{position:absolute;display:none;width:100%;height:100%;background:#cdcdcd;opacity:.6;z-index:100}.iframemask{position:absolute;display:none;z-index:80;top:0;left:0;width:100%;height:100%;background:#fff;border:none;opacity:0}.allmenu{position:absolute;display:none;margin-left:-400px;padding:10px;width:800px;top:90px;left:50%;background:#fff;border-radius:.2rem;z-index:999}.allmenu .allmenu-box{margin:0 auto;text-align:left;overflow:hidden;padding-left:2px}.maptop{margin-left:-1px;padding-right:6px;padding-left:6px;float:left;width:130px;overflow:hidden}.maptop dt.bigitem{padding:6px 10px;line-height:18px;color:#fff;background:#424b51}.mapitem dt{line-height:30px;text-indent:10px;background:#EFF1F1}.mapitem ul{margin-top:10px;margin-bottom:10px}.mapitem ul li{line-height:26px;text-indent:20px;background:url(../../static/web/img/arrr.gif)0 8px no-repeat}.allmenu a{color:#424b51}.allmenu a:hover{color:#dc3545}#login .theme{margin-top:20px;padding:10px;width:70%;clear:both}#login .theme li{margin:10px 0;overflow:hidden}#login .theme span{display:inline-block;float:left;width:150px;line-height:26px;color:#424b51;text-align:right}.allsearch{border:1px solid #fff;border-radius:.2rem}.search{margin-left:10px;width:40px;height:20px;line-height:20px;font-size:12px;color:#fff;background:#57960f;border-radius:.2rem;border:0;cursor:pointer} \ No newline at end of file +*{margin:0;padding:0;letter-spacing:.4px;box-sizing:border-box}body{line-height:1.5;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#fff;overflow:hidden}body.hidemenu{background:none}body.showmenu .body-left{display:block}body.hidemenu .body-left{display:none}body.showmenu .body-right{left:250px;transition:all .2s}body.hidemenu .body-right{left:0;transition:all .2s}a,a:hover{text-decoration:none}ul,li{list-style:none}input[type=text]{padding:.2rem;width:140px;height:26px;line-height:26px;font-size:12px;background:#fff;border:0;border-radius:.2rem;vertical-align:middle}input[type=text]:focus{box-shadow:none;outline:none}.body-left{position:absolute;top:60px;width:250px;left:0;bottom:0;z-index:7}.body-right{position:absolute;right:0;top:60px;bottom:0;z-index:7}.main{height:100%}.main iframe{width:100%;height:100%;z-index:20}.menu{height:100%}.menu iframe{width:100%;height:100%;z-index:20}.head{position:relative;width:100%;height:60px;overflow:hidden;z-index:8}.top{width:100%;height:60px;background:linear-gradient(45deg,#008e38,#57960f 50%);box-shadow:0 0.125rem 0.25rem rgba(0,0,0,.075)}.top .top-logo{float:left;width:220px;margin-left:30px}.top .top-dedebiz a{float:left;height:60px;line-height:60px;font-size:18px;color:#fff;font-weight:600}.top .top-version a{float:left;height:60px;line-height:60px;font-size:18px;font-weight:600;color:#fff}.top .top-version{float:left;margin-top:20px;margin-left:10px;color:#fff}.top .btn-primary{float:left;margin-top:18px;margin-left:10px;padding:2px;line-height:12px;font-size:12px;color:#fff}.top .btn-warning{float:left;margin-top:18px;margin-left:10px;padding:2px;line-height:12px;font-size:12px;color:#fff}.top .top-item ul li{float:left;padding-left:20px;height:60px;line-height:60px}.top .top-item ul li a{color:#fff}.top .top-item ul li a:hover{color:#dee2e6}.search{margin-left:-20px;height:20px;line-height:20px;font-size:12px;color:#424b51;background:0;border-radius:.2rem;border:0;cursor:pointer}.top .top-admin{float:right;height:60px;line-height:60px;margin-right:30px}.top .top-admin img{margin-right:10px;width:30px;height:30px;border-radius:50%;vertical-align:middle}.top .top-admin ul li{float:left;padding-left:20px;height:60px;line-height:60px}.top .top-admin ul li a{color:#fff}.top .top-admin ul li a:hover{color:#dee2e6}.menu-box{margin:0;padding:0 6px;background:#f8f8f8;overflow:scroll;overflow-x:hidden}.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:6px;padding:6px 0;width:50px;color:#424b51;background:#fff;box-shadow:0 0.125rem 0.25rem rgba(0,0,0,.075);border-radius:.2rem 0 0 .2rem;cursor:pointer;text-align:center;transition:all .2s}a.menu-item:hover div{color:#fff;background:#424b51}a.menu-active div{margin-bottom:6px;padding:6px 0;width:50px;color:#fff;background:#424b51;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:#f8f8f8;border-radius:.2rem;cursor:pointer}dl.bitem dt b{color:#424b51}.sitemu li{padding:0 0 0 24px;display:block;height:26px;line-height:26px}.fllct{float:left}.flrct{float:right}.fa-minus-circle{color:#dc3545}.fa-plus-circle{color:#28a745} \ No newline at end of file diff --git a/src/admin/index_testenv.php b/src/admin/index_testenv.php index 22e3af83..92c6f211 100644 --- a/src/admin/index_testenv.php +++ b/src/admin/index_testenv.php @@ -135,11 +135,11 @@ if (version_compare(PHP_VERSION, '5.3.0', '<')) { $safeMsg[] = 'PHP版本过低会无法正常使用系统，强烈建议升级到PHP7.X'; } if (!DEDEBIZ_SAFE_MODE) { - $safeMsg[] = '系统运行环境为：非安全模式，强烈建议启用安全模式 查看'; + $safeMsg[] = '系统运行环境为：非安全模式，强烈建议启用安全模式 [查看]'; } $rs = TestAdminPWD(); if ($rs < 0) { - $linkurl = '修改'; + $linkurl = '[修改]'; switch ($rs) { case -1: $msg = "默认管理员名称admin没有修改，建议您修改 {$linkurl}"; diff --git a/src/admin/js/frame.js b/src/admin/js/frame.js index 64fe28f2..6055c04e 100644 --- a/src/admin/js/frame.js +++ b/src/admin/js/frame.js @@ -1,68 +1,16 @@ -var $ = jQuery; -var thespeed = 5; -var navIE = document.all && navigator.userAgent.indexOf("Firefox") == -1; -var myspeed = 0; $(function () { //左侧菜单开关 LeftMenuToggle(); - //全部功能开关 - AllMenuToggle(); - //取消菜单链接虚线 - $(".head").find("a").click(function () { $(this).blur() }); - $(".menu").find("a").click(function () { $(this).blur() }); -}).keydown(function (event) {//快捷键 - if (event.keyCode == 116) { - } - if (event.keyCode == 27) { - $("#qucikmenu").slideToggle("fast") - } }); -function LeftMenuToggle() {//左侧菜单开关 +function LeftMenuToggle() { + //左侧菜单开关 $("#togglemenu").click(function () { if ($("body").attr("class") == "showmenu") { $("body").attr("class", "hidemenu"); - $(this).html(" 显示菜单"); + $(this).html(''); } else { $("body").attr("class", "showmenu"); - $(this).html(" 隐藏菜单"); + $(this).html(''); } }); -} -function AllMenuToggle() {//全部功能开关 - mask = $(".pagemask,.iframemask,.allmenu"); - $("#allmenu").click(function () { - mask.show(); - }); - mask.click(function () { mask.hide(); }); -} -function AC(act) { - mlink = $("a[id='" + act + "']"); - if (mlink.size() > 0) { - box = mlink.parents("div[id^='menu_']"); - boxid = box.attr("id").substring(5, 128); - if ($("body").attr("class") != "showmenu") $("#togglemenu").click(); - if (mlink.attr("_url")) { - $("#menu").find("div[id^=menu]").hide(); - box.show(); - mlink.addClass("thisclass").blur().parents("#menu").find("ul li a").not(mlink).removeClass("thisclass"); - if ($("#mod_" + boxid).attr("class") == "") { - $("#nav").find("a").removeClass("thisclass"); - $("#nav").find("a[id='mod_" + boxid + "']").addClass("thisclass").blur(); - } - main.location.href = mlink.attr("_url"); - } else if (mlink.attr("_open") && mlink.attr("_open") != undefined) { - window.open(mlink.attr("_open")); - } - } -} -/********************* - * 滚动按钮设置 -*********************/ -function scrollwindow() { - parent.frames['menu'].scrollBy(0, myspeed); -} -function initializeIT() { - if (myspeed != 0) { - scrollwindow(); - } } \ No newline at end of file diff --git a/src/admin/js/leftmenu.js b/src/admin/js/leftmenu.js index fdd9483d..d1ae7b58 100644 --- a/src/admin/js/leftmenu.js +++ b/src/admin/js/leftmenu.js @@ -9,8 +9,7 @@ function showHide(objname, o) { obj.style.display = 'none'; o.querySelector("i").className = "fa fa-angle-right" - } - else{ + } else { obj.style.display = 'block'; o.querySelector("i").className = "fa fa-angle-down" } @@ -111,8 +110,8 @@ function ShowMainMenu(n) { curCt.style.display = 'none'; targetCt.style.display = 'block'; - curLink.className = 'mm'; - targetLink.className = 'mmac'; + curLink.className = 'menu-item'; + targetLink.className = 'menu-active'; curitem = n; } else { fetch("index_menu_load.php?openitem="+n).then(resp=>resp.text()).then((d)=>{ @@ -121,8 +120,8 @@ function ShowMainMenu(n) { curCt.style.display = 'none'; targetCt.style.display = 'block'; - curLink.className = 'mm'; - targetLink.className = 'mmac'; + curLink.className = 'menu-item'; + targetLink.className = 'menu-active'; curitem = n; } }); diff --git a/src/admin/templets/catalog_add.htm b/src/admin/templets/catalog_add.htm index 9d56c731..db0a6e44 100644 --- a/src/admin/templets/catalog_add.htm +++ b/src/admin/templets/catalog_add.htm @@ -158,7 +158,7 @@ - + @@ -171,7 +171,7 @@
常规选项常规选项 高级选项 栏目内容
- + diff --git a/src/admin/templets/catalog_edit.htm b/src/admin/templets/catalog_edit.htm index b0dae1f9..c41ef2a5 100644 --- a/src/admin/templets/catalog_edit.htm +++ b/src/admin/templets/catalog_edit.htm @@ -139,7 +139,7 @@
常规选项常规选项 高级选项 栏目内容
- + @@ -152,7 +152,7 @@
常规选项常规选项 高级选项 栏目内容
- + diff --git a/src/admin/templets/index.htm b/src/admin/templets/index.htm index 1075a56d..a481d1d1 100644 --- a/src/admin/templets/index.htm +++ b/src/admin/templets/index.htm @@ -23,33 +23,20 @@ -
- -
-
- -
-
-
-
常规选项常规选项 高级选项 栏目内容
- -
- + +
运维
 - +
插件
 - +
更新
 - +
会员
 getUserType()>=10) { ?> - +
模板
 - +
系统
 		+
getUserRank(),'main'); ?>
diff --git a/src/system/common.inc.php b/src/system/common.inc.php index 68c81721..c296f757 100755 --- a/src/system/common.inc.php +++ b/src/system/common.inc.php @@ -8,7 +8,7 @@ */ //V6安全模式，如果启用安全模式，后台将禁用例如：模板管理、标签管理、数据库管理等存在较高安全风险的功能 define('DEDEBIZ_SAFE_MODE', TRUE); //启用安全模式 -// define('DEDEBIZ_SAFE_MODE', FALSE); //关闭安全模式 +//define('DEDEBIZ_SAFE_MODE', FALSE); //关闭安全模式 //生产环境使用`production`，如果采用`dev`模式，会有一些php的报错信息提示，便于开发调试 if (!defined('DEDE_ENVIRONMENT')) { define('DEDE_ENVIRONMENT', 'production');