DedeBIZ
/
DedeV6
Observar 2
Favorito 0
Fork 0
Código Pull requests 0 Versões 31 Atividade
Ver código fonte

阶段1

tags/6.3.0
叙述、别离 2 anos atrás
pai
8f0b897976
commit
0ccba8e54a
6 arquivos alterados com 204 adições e 144 exclusões
Visão dividida
Opções de diferenças
Mostrar estatísticas Baixar arquivo de patch Baixar arquivo de diferenças
  1. +0
    -1
      src/admin/css/login.min.css
  2. +11
    -11
      src/admin/templets/index.htm
  3. +11
    -5
      src/admin/templets/login.htm
  4. +31
    -27
      src/install/install.html
  5. +148
    -97
      src/static/web/css/admin.css
  6. +3
    -3
      src/static/web/css/style.css

+ 0
- 1
src/admin/css/login.min.css Ver arquivo

@@ -1 +0,0 @@
body{line-height:1.6;letter-spacing:0.5px;font-size:14px;font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#f5f5f5}a{color:#545b62;text-decoration:none}a:hover{color:#007bff;text-decoration:none}h2{line-height:1.2;font-size:24px;color:#393d49;font-weight:600}.btn,input,select{font-size:14px!important}.admin-head{padding:1rem 0;background:#fff}.admin-nav{height:36px;line-height:36px}.admin-nav-a{padding-right:30px}.dropdown-menu{min-width:8rem;font-size:14px}.dropdown-item{padding:0 1rem;height:30px;line-height:30px;font-size:14px;color:#545b62!important}.logo,.form-control{height:36px}.login-from{margin:5rem auto;width:500px}.login-box{padding:1.25rem;background:#fff}.login-box,.form-control,.btn-md,.alert,.rounded{border-radius:0.5rem!important}.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label,.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label::after,.input-group:not(.has-validation)>.custom-select:not(:last-child),.input-group:not(.has-validation)>.form-control:not(:last-child){border-top-right-radius:0!important;border-bottom-right-radius:0!important}.input-group>.input-group-append>.btn,.input-group>.input-group-append>.input-group-text,.input-group>.input-group-prepend:first-child>.btn:not(:first-child),.input-group>.input-group-prepend:first-child>.input-group-text:not(:first-child),.input-group>.input-group-prepend:not(:first-child)>.btn,.input-group>.input-group-prepend:not(:first-child)>.input-group-text{border-top-left-radius:0!important;border-bottom-left-radius:0!important}#validateimg{border-radius:0 0.5rem 0.5rem 0;cursor:pointer}#browsehappy{padding:1rem 30px;font-size:14px;color:#856404;background:#fff3cd}.browsehappy-close{float:right;font-size:14px;cursor:pointer}@media (max-width:768px){.admin-nav-a{display:none!important}.login-from{width:100%}}

+ 11
- 11
src/admin/templets/index.htm Ver arquivo

@@ -12,26 +12,26 @@
<script src="../static/web/js/jquery.min.js"></script>
<script src="js/main.js"></script>
</head>
<body class="showmenu">
<body class="menu-show">
<?php if (preg_match('/MSIE/i',$_SERVER['HTTP_USER_AGENT']) || preg_match('/Trident/i',$_SERVER['HTTP_USER_AGENT'])) {?>
<div id="browsehappy">
<span>您使用的浏览器已过时，请<a href="https://www.dedebiz.com/browsehappy" target="_blank">升级浏览器</a>，提高后台操作体验</span>
<a onclick="document.getElementById('browsehappy').style.display='none';" class="browsehappy-close"><i class="fa fa-times"></i></a>
</div>
<?php }?>
<div class="head shadow-sm">
<div class="top-logo">
<span class="top-name"><a href="index_body.php" target="main"><?php echo cn_substr($cfg_webname,8);?></a></span>
<span class="top-version"><?php echo $cfg_version_detail;?></span>
<div class="admin-head shadow-sm">
<div class="logo">
<span class="name"><a href="index_body.php" target="main"><?php echo cn_substr($cfg_webname,8);?></a></span>
<span class="version"><?php echo $cfg_version_detail;?></span>
<?php if (DEDEBIZ_SAFE_MODE) {?>
<a href="index_body.php?dopost=safe_mode" target="main" class="btn btn-primary btn-xs btn-version">安全</a>
<?php } else {?>
<a href="index_body.php?dopost=safe_mode" target="main" class="btn btn-warning btn-xs btn-version">开发</a>
<?php }?>
</div>
<nav class="top-item">
<ul class="mb-0">
<li class="pl-0"><a href="javascript:;" id="togglemenu" title="侧边伸缩"><i class="fa fa-dedent"></i></a></li>
<div class="item">
<ul>
<li><a href="javascript:;" id="togglemenu" title="侧边伸缩"><i class="fa fa-dedent"></i></a></li>
<?php if ($cuserLogin->getUserType() >= 10) {?>
<li class="d-none d-lg-block"><a href="sys_info.php" target="main" title="系统设置"><i class="fa fa-cog"></i></a></li>
<li class="d-none d-lg-block"><a href="catalog_main.php" target="main" title="栏目管理"><i class="fa fa-bars"></i></a></li>
@@ -49,9 +49,9 @@
</form>
</li>
</ul>
</nav>
<div class="top-admin">
<ul class="mb-0">
</div>
<div class="admin">
<ul>
<li class="d-none d-lg-block"><a href="sys_admin_user_edit.php?id=<?php echo $cuserLogin->getUserID();?>&dopost=edit" target="main"><img src="<?php echo $cuserLogin->getUserFace();?>"><?php echo $cuserLogin->getUserName();?><?php if ($cuserLogin->getUserType() == 10){echo "<span class='btn btn-success btn-xs ml-2'>管理员</span>";} else if ($cuserLogin->getUserType() == 5) {echo "<span class='btn btn-success btn-xs ml-2'>栏目员</span>";} else {echo "<span class='btn btn-success btn-xs ml-2'>文档员</span>";}?></a></li>
<li><a href="exit.php">退了</a></li>
</ul>


+ 11
- 5
src/admin/templets/login.htm Ver arquivo

@@ -8,22 +8,28 @@
<title><?php echo $cfg_webname;?>后台登录</title>
<link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
<link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
<link rel="stylesheet" href="css/login.min.css">
<link rel="stylesheet" href="../static/web/css/admin.css">
<script src="../static/web/js/jquery.min.js"></script>
<script src="../static/web/js/login.js"></script>
</head>
<body>
<body class="body-bg">
<?php if (preg_match('/MSIE/i',$_SERVER['HTTP_USER_AGENT']) || preg_match('/Trident/i',$_SERVER['HTTP_USER_AGENT'])) {?>
<div id="browsehappy">
<span>您使用的浏览器已过时，请<a href="https://www.dedebiz.com/browsehappy" target="_blank">升级浏览器</a>，提高后台操作体验</span>
<a onclick="document.getElementById('browsehappy').style.display='none';" class="browsehappy-close"><i class="fa fa-times"></i></a>
</div>
<?php }?>
<div class="admin-head shadow-sm mb-3">
<div class="login-head shadow-sm mb-3">
<div class="container">
<div class="row align-items-center">
<div class="col-6 col-md-4"><img src="../static/web/img/logo.png" title="<?php echo $cfg_soft_enname;?>" class="logo"></div>
<div class="col-6 col-md-8 text-right d-flex justify-content-end admin-nav"><a href="/" target="_blank" class="admin-nav-a"><i class="fa fa-home"></i> 网站首页</a></div>
<div class="col-6 col-md-4">
<a href="/" target="_blank" class="logo"><img src="../static/web/img/favicon.ico" title="<?php echo $cfg_soft_enname;?>"><?php echo $cfg_webname;?></a>
</div>
<div class="col-6 col-md-8">
<div class="d-flex justify-content-end text-right">
<a href="/" target="_blank"><i class="fa fa-home"></i> 网站首页</a>
</div>
</div>
</div>
</div>
</div>


+ 31
- 27
src/install/install.html Ver arquivo

@@ -6,20 +6,24 @@
<title>安装DedeV<?php echo $cfg_version_detail;?></title>
<link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
<link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
<link rel="stylesheet" href="../static/web/css/admin.css">
<link rel="shortcut icon" href="../static/web/img/favicon.ico">
<script src="../static/web/js/jquery.min.js"></script>
<script src="../static/web/js/bootstrap.min.js"></script>
<script src="../static/web/js/style.js"></script>
<style>body{line-height:1.6;letter-spacing:0.5px;font-size:14px;font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#f5f5f5}a{color:#545b62;text-decoration:none}a:hover{color:#007bff;text-decoration:none}h2,legend{line-height:1.2;font-size:18px;font-weight:600;color:#393d49}label{margin-bottom:10px;line-height:18px}input,select,.btn{font-size:14px!important}.install-box{margin:0 auto;width:800px}.admin-head{padding:1rem 0;background:#fff}.admin-nav{height:36px;line-height:36px}.admin-nav-a{padding-right:30px}.dropdown-menu{min-width:8rem;font-size:14px}.dropdown-item{padding:0 1rem;height:36px;line-height:36px;font-size:14px;color:#545b62!important}.fa{font-size:14px!important;color:inherit;cursor:pointer}.logo,.form-control{height:36px}.form-control,.btn-md,.card,.alert,.rounded{border-radius:0.5rem!important}.card-header:first-child{border-radius:0.5rem 0.5rem 0 0}.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label,.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label::after,.input-group:not(.has-validation)>.custom-select:not(:last-child),.input-group:not(.has-validation)>.form-control:not(:last-child){border-top-right-radius:0!important;border-bottom-right-radius:0!important}.input-group>.input-group-append>.btn,.input-group>.input-group-append>.input-group-text,.input-group>.input-group-prepend:first-child>.btn:not(:first-child),.input-group>.input-group-prepend:first-child>.input-group-text:not(:first-child),.input-group>.input-group-prepend:not(:first-child)>.btn,.input-group>.input-group-prepend:not(:first-child)>.input-group-text{border-top-left-radius:0!important;border-bottom-left-radius:0!important}@media (max-width:760px){.install-box{width:100%}.admin-nav-a{display:none!important}}</style>
</head>
<body>
<div class="admin-head shadow-sm mb-3">
<body class="body-bg">
<div class="login-head shadow-sm mb-3">
<div class="container">
<div class="row align-items-center">
<div class="col-6 col-md-4"><img src="../static/web/img/logo.png" title="<?php echo $cfg_soft_enname;?>" class="logo"></div>
<div class="col-6 col-md-8 text-right d-flex justify-content-end admin-nav">
<a href="https://www.dedebiz.com/help" target="_blank" class="admin-nav-a"><i class="fa fa-info-circle"></i> 帮助中心</a>
<a href="https://www.dedebiz.com/service" target="_blank" class="admin-nav-a"><i class="fa fa-handshake-o"></i> 技术服务</a>
<div class="col-6 col-md-4">
<a href="/" target="_blank" class="logo"><img src="../static/web/img/logo.png"></a>
</div>
<div class="col-6 col-md-8">
<div class="d-flex justify-content-end text-right">
<a href="https://www.dedebiz.com/help" target="_blank"><i class="fa fa-info-circle"></i> 帮助中心</a>
<a href="https://www.dedebiz.com/service" target="_blank" class="ml-3 d-none d-lg-block"><i class="fa fa-handshake-o"></i> 技术服务</a>
</div>
</div>
</div>
</div>
@@ -59,7 +63,7 @@
<input type="text" name="dbuser" id="dbuser" class="form-control" placeholder="root">
</div>
<div class="form-group server">
<label for="exampleInputPassword1" class="form-label">数据库密码</label>
<label for="dbpwd" class="form-label">数据库密码</label>
<input type="text" name="dbpwd" id="dbpwd" class="form-control" placeholder="请输入数据库密码">
</div>
<div class="form-group">
@@ -110,27 +114,27 @@
</div>
<script>
$("#btnCheckConnect").click(function() {
let dbhost = $('#dbhost').val();
let dbuser = $('#dbuser').val();
let dbpwd = $('#dbpwd').val();
if (!dbhost) dbhost = "localhost";
if (!dbuser) dbuser = "root";
$.get('index.php?step=10&dbhost=' + dbhost + '&dbuser=' + dbuser + '&dbpwd=' + dbpwd,
function(rs) {
let result = JSON.parse(rs);
if (result.code === 200) {
ShowAlert("#alertConnect", result.data, "success", 5000)
} else {
ShowAlert("#alertConnect", result.data, "danger", 5000)
}
})
let dbhost = $('#dbhost').val();
let dbuser = $('#dbuser').val();
let dbpwd = $('#dbpwd').val();
if (!dbhost) dbhost = "localhost";
if (!dbuser) dbuser = "root";
$.get('index.php?step=10&dbhost=' + dbhost + '&dbuser=' + dbuser + '&dbpwd=' + dbpwd,function(rs) {
console.log(rs);
let result = JSON.parse(rs);
if (result.code === 200) {
ShowAlert("#alertConnect", result.data, "success", 5000);
} else {
ShowAlert("#alertConnect", result.data, "danger", 5000);
}
})
});
$("#dbtype").change(function() {
if ($(this).val() === 'sqlite') {
$(".form-group.server").hide()
} else {
$(".form-group.server").show()
}
if ($(this).val() === 'sqlite') {
$(".form-group.server").hide()
} else {
$(".form-group.server").show()
}
});
</script>
</body>

+ 148
- 97
src/static/web/css/admin.css Ver arquivo

@@ -37,7 +37,7 @@ img {
p {
margin-bottom:10px
}
ul,ol,li {
ul,ol,li,form {
margin:0;
padding:0
}
@@ -69,9 +69,6 @@ td {
word-break:break-all;
word-wrap:break-word
}
form,label {
margin-bottom:0
}
input {
padding:0.375rem 0.75rem;
height:30px;
@@ -133,20 +130,53 @@ input:focus,select:focus,textarea:focus {
box-shadow:0 0 0 0.2rem rgba(0,123,255,.25);
outline:0
}
body.hidemenu {
background:none
.login-head {
padding:1rem 0;
background:#fff
}
.login-head .logo {
font-size:18px;
color:#393d49;
font-weight:600
}
.login-head .logo img {
height:36px
}
.install-box {
margin:0 auto;
width:800px
}
.install-box .card-header,.install-box .card-body {
padding:1.25rem
}
.install-box h2,.install-box legend,.login-box h2 {
line-height:1.2;
font-size:18px;
font-weight:600;
color:#393d49
}
.install-box .form-control,.login-box .form-control {
height:36px
}
.login-from {
margin:5rem auto;
width:500px
}
.login-box {
padding:1.25rem;
background:#fff
}
body.showmenu .menu-left {
body.menu-show .menu-left {
display:block
}
body.hidemenu .menu-left {
display:none
body.menu-hide,body.menu-hide .menu-left {
background:none
}
body.showmenu .body-right {
body.menu-show .body-right {
left:220px;
transition:all 0.5s
}
body.hidemenu .body-right {
body.menu-hide .body-right {
left:0;
transition:all 0.5s
}
@@ -163,9 +193,6 @@ body.hidemenu .body-right {
right:0;
bottom:0
}
.body-bg {
background:#f5f5f5
}
.main,.menu {
width:100%;
height:99%
@@ -214,17 +241,17 @@ body.hidemenu .body-right {
.item-menu li.open i.fa-angle-down {
transform:rotate(180deg)
}
.head {
.admin-head {
width:100%;
height:60px;
background:linear-gradient(45deg,#1eb867,#009688 80%)
}
.top-logo {
.admin-head .logo {
float:left;
padding-left:30px;
width:220px
}
.top-name a {
.admin-head .logo .name a {
float:left;
height:60px;
line-height:60px;
@@ -232,7 +259,7 @@ body.hidemenu .body-right {
font-weight:600;
color:#fff
}
.top-version a {
.admin-head .logo .version a {
float:left;
height:60px;
line-height:60px;
@@ -240,32 +267,33 @@ body.hidemenu .body-right {
font-weight:600;
color:#fff
}
.top-version {
.admin-head .logo .version {
float:left;
margin-top:18px;
margin-left:5px;
font-size:12px;
color:#fff
}
.btn-version {
float:left;
margin-top:18px;
margin-left:5px
.admin-head .item ul,.admin-head .admin ul {
margin:0
}
.top-item ul li {
.admin-head .item ul li {
float:left;
position:relative;
padding-left:30px;
height:60px;
line-height:60px
}
.top-item ul li a,.top-admin ul li a {
.admin-head .item ul li:first-child {
padding-left:1rem
}
.admin-head .item ul li a,.admin-head .admin ul li a {
color:#fff
}
.top-item ul li a:hover,.top-admin ul li a:hover {
.admin-head .item ul li a:hover,.admin-head .admin ul li a:hover {
color:#dee2e6
}
.search {
.admin-head .item .search {
position:absolute;
top:20px;
right:5px;
@@ -275,52 +303,49 @@ body.hidemenu .body-right {
background:0;
border:0
}
.top-admin {
.admin-head .admin {
float:right;
margin-right:30px;
height:60px;
line-height:60px
}
.top-admin img {
.admin-head .admin img {
width:30px;
height:30px;
border-radius:50%
}
.top-admin ul li {
.admin-head .admin ul li {
float:left;
padding-left:30px;
height:60px;
line-height:60px
}
.user-img-sm {
width:30px;
height:30px;
border-radius:50%;
border:1px solid #eee
.admin-head .admin ul li:first-child {
padding-left:0
}
.submenu {
.sidemenu {
display:none;
padding:5px 0;
background:#adb5bd
}
.submenu li {
.sidemenu li {
height:40px;
line-height:40px
}
.submenu li:hover {
.sidemenu li:hover {
background:#009688;
transition:all 0.5s
}
.submenu a {
.sidemenu a {
float:left;
display:block;
padding:0 10px 0 50px;
color:#fff
}
.submenu .active {
.sidemenu .active {
background:#1eb867
}
.submenu-right {
.sidemenu-right {
float:right!important;
padding:0 20px 0 10px!important
}
@@ -473,8 +498,12 @@ body.hidemenu .body-right {
.option3 {
background:#fff
}
.modal-title {
font-size:16px
.body-bg {
background:#f5f5f5
}
.upload-bg {
margin:10px;
background:#fff
}
.tips-box {
margin:70px auto 0;
@@ -503,6 +532,44 @@ body.hidemenu .body-right {
word-break:break-all;
word-wrap:break-word
}
.user-img-sm {
width:30px;
height:30px;
border-radius:50%;
border:1px solid #eee
}
.thumbnail-md {
max-width:200px;
max-height:120px
}
.thumbnail-sm {
max-width:80px;
max-height:80px
}
.icon img {
width:20px;
height:20px
}
.list-group-item {
padding:0.5rem 0
}
.modal-title {
font-size:16px
}
.fileinput-button {
display:inline-block;
position:relative;
overflow:hidden
}
.fileinput-button input {
position:absolute;
top:0;
right:0;
margin:0;
opacity:0;
direction:ltr;
cursor:pointer
}
.maintable {
width:98%!important;
border:1px solid #dee2e6!important
@@ -522,25 +589,6 @@ body.hidemenu .body-right {
font-size:14px!important;
color:inherit
}
.list-group-item {
padding:0.5rem 0
}
.btn-sm {
padding:0.375rem 0.55rem;
height:30px;
line-height:1.5;
font-size:12px
}
.btn-xs {
padding:0.22rem;
height:20px;
line-height:1;
font-size:12px;
border-radius:0.35rem!important
}
.btn+.btn {
margin-left:10px
}
.admin-win {
background:#f5f5f5;
border:1px solid #dee2e6!important
@@ -582,47 +630,17 @@ body.hidemenu .body-right {
.admin-input-xs {
width:60px
}
.thumbnail-md {
max-width:200px;
max-height:120px
}
.thumbnail-sm {
max-width:80px;
max-height:80px
}
.upload-bg {
margin:10px;
background:#fff
}
.icon img {
width:20px;
height:20px
}
.fileinput-button {
display:inline-block;
position:relative;
overflow:hidden
}
.fileinput-button input {
position:absolute;
top:0;
right:0;
margin:0;
opacity:0;
direction:ltr;
cursor:pointer
}
span.page-link {
color:#fff;
background:#1eb867
}
table,input,select,textarea,.search,.menu-body,.coolbg,.mysource,.mywriter,.pubdlg,.colordlg,.quickselitem .topcat,.web-info,.upload-bg,.cke_chrome,.cke_inner,.pagination,.card,.form-control,.btn-sm,.alert,.rounded,#edsta {
table,input,select,textarea,.login-box,.menu-body,.coolbg,.mysource,.mywriter,.pubdlg,.colordlg,.quickselitem .topcat,.web-info,.upload-bg,.cke_chrome,.cke_inner,.pagination,.card,.form-control,.btn,.alert,.rounded,#edsta {
border-radius:0.5rem!important
}
.coolbg2,.pubdlg .title,.cke_top {
border-radius:0.5rem 0.5rem 0 0!important
}
.submenu,.wsselect,.cke_bottom {
.sidemenu,.wsselect,.cke_bottom {
border-radius:0 0 0.5rem 0.5rem!important
}
.page-item:first-child .page-link {
@@ -633,6 +651,39 @@ table,input,select,textarea,.search,.menu-body,.coolbg,.mysource,.mywriter,.pubd
border-top-right-radius:0.5rem!important;
border-bottom-right-radius:0.5rem!important
}
.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label,.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label::after,.input-group:not(.has-validation)>.custom-select:not(:last-child),.input-group:not(.has-validation)>.form-control:not(:last-child) {
border-top-right-radius:0!important;
border-bottom-right-radius:0!important
}
.input-group>.input-group-append>.btn,.input-group>.input-group-append>.input-group-text,.input-group>.input-group-prepend:first-child>.btn:not(:first-child),.input-group>.input-group-prepend:first-child>.input-group-text:not(:first-child),.input-group>.input-group-prepend:not(:first-child)>.btn,.input-group>.input-group-prepend:not(:first-child)>.input-group-text {
border-top-left-radius:0!important;
border-bottom-left-radius:0!important
}
.btn-sm {
padding:0.375rem 0.55rem;
height:30px;
line-height:1.5;
font-size:12px
}
.btn-xs {
padding:0.22rem;
height:20px;
line-height:1;
font-size:12px;
border-radius:0.35rem!important
}
.btn+.btn {
margin-left:10px
}
.btn-version {
float:left;
margin-top:18px;
margin-left:5px
}
#validateimg {
border-radius:0 0.5rem 0.5rem 0;
cursor:pointer
}
#selColor {
padding:5px;
width:35px
@@ -667,10 +718,10 @@ table,input,select,textarea,.search,.menu-body,.coolbg,.mysource,.mywriter,.pubd
}
}
@media (max-width:768px) {
.install-box,.login-from,.tips-box {
width:100%
}
.tips {
padding:0 15px
}
.tips-box {
width:100%
}
}

+ 3
- 3
src/static/web/css/style.css Ver arquivo

@@ -398,9 +398,6 @@ input[type=file] {
.cke_bottom,.list-article-radius {
border-radius:0 0 0.5rem 0.5rem!important
}
#validateimg,.btn-send {
border-radius:0 0.5rem 0.5rem 0!important
}
.rounded-circle {
border-radius:50%!important
}
@@ -420,6 +417,9 @@ input[type=file] {
border-top-left-radius:0!important;
border-bottom-left-radius:0!important
}
#validateimg,.btn-send {
border-radius:0 0.5rem 0.5rem 0!important
}
#returntop {
display:none;
position:fixed;


Escrever Pré-visualização
Carregando…
Cancelar
Salvar