Browse Source

调整安装程序,更改为dedecmsv6

tags/6.0.0
tianya 3 years ago
parent
commit
da3f3ed3f1
14 changed files with 110 additions and 111 deletions
  1. +28
    -28
      src/dede/css/base.css
  2. +1
    -1
      src/include/helpers/channelunit.helper.php
  3. BIN
      src/install/images/top-logo.png
  4. +43
    -34
      src/install/style.css
  5. +11
    -5
      src/install/templates/step-1.html
  6. +9
    -7
      src/install/templates/step-2.html
  7. +8
    -27
      src/install/templates/step-3.html
  8. +10
    -9
      src/install/templates/step-5.html
  9. BIN
      src/static/ad1.jpg
  10. BIN
      src/static/ad2.jpg
  11. BIN
      src/static/banner01.gif
  12. BIN
      src/static/banner02.gif
  13. BIN
      src/static/banner02.jpg
  14. BIN
      src/static/dede.gif

+ 28
- 28
src/dede/css/base.css View File

@@ -37,40 +37,40 @@ li,dd {
select {
height: calc(1.5em + .75rem + 2px);
padding: .375rem .75rem;
font-size: 1rem;
font-weight: 400;
color: #495057;
background-color: #fff;
background-clip: padding-box;
border: 1px solid #ced4da;
border-radius: .25rem;
transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out;
font-size: 1rem;
font-weight: 400;
color: #495057;
background-color: #fff;
background-clip: padding-box;
border: 1px solid #ced4da;
border-radius: .25rem;
transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out;
}
input[type="button"],input[type="submit"],input[type="reset"] {
border: none;
border-right: 1px solid #ACACAC;
border-bottom: 1px solid #ACACAC;
background-color: #F1F8B4;
padding: 2px;
padding-right: 5px;
padding-left: 5px;
cursor: pointer;
border: none;
border-right: 1px solid #ACACAC;
border-bottom: 1px solid #ACACAC;
background-color: #F1F8B4;
padding: 2px;
padding-right: 5px;
padding-left: 5px;
cursor: pointer;
}
input[type="text"],input[type="password"] {
font-size: 1rem;
font-weight: 400;
color: #495057;
background-color: #fff;
background-clip: padding-box;
border: 1px solid #ced4da;
border-radius: .25rem;
height: calc(1.5em + .75rem + 2px);
padding: .375rem .75rem;
transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out;
line-height: 18px;
vertical-align: middle;
font-size: 1rem;
font-weight: 400;
color: #495057;
background-color: #fff;
background-clip: padding-box;
border: 1px solid #ced4da;
border-radius: .25rem;
height: calc(1.5em + .75rem + 2px);
padding: .375rem .75rem;
transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out;
line-height: 18px;
vertical-align: middle;
}
input[type="text"]:focus,input[type="password"]:focus {


+ 1
- 1
src/include/helpers/channelunit.helper.php View File

@@ -392,7 +392,7 @@ function GetSonIds($id,$channel=0,$addthis=true)
{
global $cfg_Cs;
$GLOBALS['idArray'] = array();
if( !is_array($cfg_Cs) )
if( !is_array($cfg_Cs) && file_exists(DEDEDATA."/cache/inc_catalog_base.inc") )
{
require_once(DEDEDATA."/cache/inc_catalog_base.inc");
}


BIN
src/install/images/top-logo.png View File

Before After
Width: 280  |  Height: 72  |  Size: 8.3KB Width: 280  |  Height: 72  |  Size: 6.6KB

+ 43
- 34
src/install/style.css View File

@@ -3,6 +3,7 @@
*{
padding:0px;
margin:0px;
font-size: 13px;
}
body{
font-family:Verdana, Arial, Helvetica, sans-serif;
@@ -23,6 +24,44 @@ a:hover{
input,button,select{
vertical-align:middle;
}
select {
height: calc(1.5em + .75rem + 2px);
padding: .375rem .75rem;
font-weight: 400;
color: #495057;
background-color: #fff;
background-clip: padding-box;
border: 1px solid #ced4da;
border-radius: .25rem;
transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out;
}
input[type="button"],input[type="submit"],input[type="reset"] {
border: none;
border-right: 1px solid #ACACAC;
border-bottom: 1px solid #ACACAC;
background-color: #F1F8B4;
padding: 2px;
padding-right: 5px;
padding-left: 5px;
cursor: pointer;
}
input[type="text"],input[type="password"] {
font-size: 1rem;
font-weight: 400;
color: #495057;
background-color: #fff;
background-clip: padding-box;
border: 1px solid #ced4da;
border-radius: .25rem;
height: calc(1.5em + .75rem + 2px);
padding: .375rem .75rem;
transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out;
line-height: 18px;
vertical-align: middle;
}
.fc-690{
color:#690;
}
@@ -49,7 +88,7 @@ input,button,select{
line-height:1000%;
}
.top .top-link{
height:15px;
height:25px;
padding:12px 12px 0px 0px;
overflow:hidden;
}
@@ -73,11 +112,11 @@ input,button,select{
.top .top-version{
height:40px;
float:right;
padding:7px 12px 0px 0px;
padding:13px 13px 0px 0px;
}
.top .top-version h2{
color:#E8F5E3;
font-size:26px;
color:#c0d4b8;
font-size:22px;
font-style:italic;
cursor:default;
}
@@ -233,36 +272,6 @@ input,button,select{
overflow:hidden;
clear:both;
}
.over-link a{
line-height:14px;
padding:6px 20px;
border-style:solid;
border-width:1px;
border-color:#EEE #CCC #CCC #EEE;
background:#FAFAFA;
color:#333;
display:block;
float:left;
margin-right:20px;
text-decoration:none;
}
.olink a{
line-height:14px;
padding:2px 20px;
border-style:solid;
border-width:1px;
border-color:#EEE #CCC #CCC #EEE;
background:#EAF4DD;
color:#333;
display:block;
margin-left:8px;
float:left;
width:55px;
margin-right:20px;
text-decoration:none;
}
.waitpage {
top:0;
left:0;


+ 11
- 5
src/install/templates/step-1.html View File

@@ -3,7 +3,13 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>安装程序 - 织梦内容管理系统<?php echo $verMsg; ?></title>
<link rel="stylesheet" href="../static/css/bootstrap.min.css">
<link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="style.css" rel="stylesheet" type="text/css" />
<script src="../static/js/jquery.min.js"></script>
<script src="../static/js/popper.min.js"></script>
<script src="../static/js/bootstrap.bundle.js"></script>
<script src="../static/js/dede.js"></script>
</head>
<body>
@@ -13,10 +19,10 @@
</div>
<div class="top-link">
<ul>
<li><a href="http://www.DedeCMS.com" target="_blank">官方网站</a></li>
<li><a href="http://bbs.DedeCMS.com" target="_blank">技术论坛</a></li>
<li><a href="https://www.zhelixie.com/DesDev" target="_blank">代码</a></li>
<li><a href="http://help.DedeCMS.com" target="_blank">帮助</a></li>
<li><a href="https://www.dedebiz.com" target="_blank">商业支持</a></li>
<li><a href="https://www.dedebiz.com/git" target="_blank">代码托管</a></li>
<li><a href="http://www.dedebiz.com/help" target="_blank">帮助中心</a></li>
<li><a href="http://www.dedecms.com" target="_blank">官方网站</a></li>
</ul>
</div>
<div class="top-version">
@@ -69,7 +75,7 @@
</div>
<div class="btn-box">
<input name="readpact" type="checkbox" id="readpact" value="" /><label for="readpact"><strong class="fc-690 fs-14">我已经阅读并同意此协议</strong></label>
<input type="button" class="btn-next" value="继续" onclick="document.getElementById('readpact').checked ?window.location.href='index.php?step=2' : alert('您必须同意软件许可协议才能安装!');" />
<button type="button" class="btn btn-success" onclick="document.getElementById('readpact').checked ?window.location.href='index.php?step=2' : ShowMsg('您必须同意软件许可协议才能安装!');">继续</button>
</div>
</div>
</div>


+ 9
- 7
src/install/templates/step-2.html View File

@@ -3,6 +3,8 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $s_lang?>" />
<title>安装程序 - 织梦内容管理系统<?php echo $verMsg; ?></title>
<link rel="stylesheet" href="../static/css/bootstrap.min.css">
<link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="style.css" rel="stylesheet" type="text/css" />
</head>
@@ -14,10 +16,10 @@
</div>
<div class="top-link">
<ul>
<li><a href="https://www.dedebiz.com" target="_blank">商业支持</a></li>
<li><a href="https://www.dedebiz.com/git" target="_blank">代码托管</a></li>
<li><a href="http://www.dedebiz.com/help" target="_blank">帮助中心</a></li>
<li><a href="http://www.dedecms.com" target="_blank">官方网站</a></li>
<li><a href="http://bbs.dedecms.com" target="_blank">技术论坛</a></li>
<li><a href="https://www.zhelixie.com/DesDev" target="_blank">代码</a></li>
<li><a href="http://help.dedecms.com" target="_blank">帮助</a></li>
</ul>
</div>
<div class="top-version">
@@ -70,7 +72,7 @@
</tr>
</table>
<div class="pr-title"><h3>系统环境检测</h3></div>
<div style="padding:2px 8px 0px; line-height:33px; height:23px; overflow:hidden; color:#666;">
<div style="padding:2px 8px 0px; line-height:33px; height:26px; overflow:hidden; color:#666;">
系统环境要求必须满足下列所有条件,否则系统或系统部份功能将无法使用。
</div>
<table width="726" border="0" align="center" cellpadding="0" cellspacing="0" class="twbox">
@@ -104,7 +106,7 @@
<div class="pr-title"><h3>目录权限检测</h3></div>
<div style="padding:2px 8px 0px; line-height:33px; height:23px; overflow:hidden; color:#666;">
<div style="padding:2px 8px 0px; line-height:33px; height:26px; overflow:hidden; color:#666;">
系统要求必须满足下列所有的目录权限全部可读写的需求才能使用,其它应用目录可安装后在管理后台检测。
</div>
<table width="726" border="0" align="center" cellpadding="0" cellspacing="0" class="twbox">
@@ -132,8 +134,8 @@
</table>
<div class="btn-box">
<input type="button" class="btn-back" value="后退" onclick="window.location.href='index.php';" />
<input type="button" class="btn-next" value="继续" onclick="window.location.href='index.php?step=3';" />
<button type="button" class="btn btn-success" value="" onclick="window.location.href='index.php';">后退</button>
<button type="button" class="btn btn-success" value="" onclick="window.location.href='index.php?step=3';" >继续</button>
</div>
</div>
</div>


+ 8
- 27
src/install/templates/step-3.html View File

@@ -5,7 +5,6 @@
<title>安装程序 - 织梦内容管理系统<?php echo $verMsg; ?></title>
<script src="../static/js/dedeajax2.js" language="javascript" type="text/javascript"></script>
<script language="javascript" type="text/javascript">
<!--
function $o(tid){
return document.getElementById(tid);
}
@@ -42,8 +41,9 @@
// >= IE8
document.querySelector("input[name='adminpwd']").value = Math.random().toString(36).slice(-8) + Math.random().toString(36).slice(-8);
}
-->
</script>
<link rel="stylesheet" href="../static/css/bootstrap.min.css">
<link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="style.css" rel="stylesheet" type="text/css" />
</head>
<body>
@@ -56,10 +56,10 @@
</div>
<div class="top-link">
<ul>
<li><a href="https://www.dedebiz.com" target="_blank">商业支持</a></li>
<li><a href="https://www.dedebiz.com/git" target="_blank">代码托管</a></li>
<li><a href="http://www.dedebiz.com/help" target="_blank">帮助中心</a></li>
<li><a href="http://www.dedecms.com" target="_blank">官方网站</a></li>
<li><a href="http://bbs.dedecms.com" target="_blank">技术论坛</a></li>
<li><a href="https://www.zhelixie.com/DesDev" target="_blank">代码</a></li>
<li><a href="http://help.dedecms.com" target="_blank">帮助</a></li>
</ul>
</div>
<div class="top-version">
@@ -84,25 +84,6 @@
</dl>
</div>
<div class="pright">
<div class="pr-title"><h3>模块选择</h3></div>
<table width="726" border="0" align="center" cellpadding="0" cellspacing="0" class="twbox">
<tr>
<td style='line-height:180%'>
<b>默认已安装模块(不需要可在后台卸载):</b><br />
百度新闻、文件管理器、挑错管理、投票模块、友情链接<br />
<b>已下载并可选安装的:(不能选中的为未下载)</b><br />
<div class='modulesel'><input type='checkbox' name='modules[]' <?php if(!IsDownLoad($module_local.'0a7bea5dbe571d35def883cbec796437')){?>disabled = 'true'<?php }?> value='0a7bea5dbe571d35def883cbec796437' /> 留言簿模块</div>
<div class='modulesel'><input type='checkbox' name='modules[]' <?php if(!IsDownLoad($module_local.'59155be87ea60c5c65ec1f7a46a0fc9d')){?>disabled = 'true'<?php }?> value='59155be87ea60c5c65ec1f7a46a0fc9d' /> 手机WAP浏览</div>
<div class='modulesel'><input type='checkbox' name='modules[]' <?php if(!IsDownLoad($module_local.'7badb72a3ff79af2a7112beee60cb970')){?>disabled = 'true'<?php }?> value='7badb72a3ff79af2a7112beee60cb970' /> 小说模块</div>
<div class='modulesel'><input type='checkbox' name='modules[]' <?php if(!IsDownLoad($module_local.'867af26e9c1ccf22a1cf67e756cf5acc')){?>disabled = 'true'<?php }?> value='867af26e9c1ccf22a1cf67e756cf5acc' /> 黄页模块</div>
<div class='modulesel'><input type='checkbox' name='modules[]' <?php if(!IsDownLoad($module_local.'8964eda9013d1df0afea08ed63243436')){?>disabled = 'true'<?php }?> value='8964eda9013d1df0afea08ed63243436' /> 站内新闻</div>
<div class='modulesel'><input type='checkbox' name='modules[]' <?php if(!IsDownLoad($module_local.'be722dbfa3cb3cb5628aab2d767ff62e')){?>disabled = 'true'<?php }?> value='be722dbfa3cb3cb5628aab2d767ff62e' /> 问答模块</div>
<div class='modulesel'><input type='checkbox' name='modules[]' <?php if(!IsDownLoad($module_local.'dfcb5cd4d7bc0e3f7eb655e62dd6bc64')){?>disabled = 'true'<?php }?> value='dfcb5cd4d7bc0e3f7eb655e62dd6bc64' /> 圈子模块</div>
<div class='modulesel'><input type='checkbox' name='modules[]' <?php if(!IsDownLoad($module_local.'c10bb6ac52082ab3e669b4814b44a6f1')){?>disabled = 'true'<?php }?> value='c10bb6ac52082ab3e669b4814b44a6f1' /> 邮件订阅</div>
<div class='modulesel'><input type='checkbox' name='modules[]' <?php if(!IsDownLoad($module_local.'8a4773468b800900dcfefbc5988833ed')){?>disabled = 'true'<?php }?> value='8a4773468b800900dcfefbc5988833ed' /> UCenter模块</div>
</td>
</tr>
</table>
<div class="pr-title"><h3>数据库设定</h3></div>
<table width="726" border="0" align="center" cellpadding="0" cellspacing="0" class="twbox">
<tr>
@@ -175,7 +156,7 @@
</tr>
<tr>
<td class="onetd"><strong>密 码:</strong></td>
<td><input name="adminpwd" type="text" value="admin" class="input-txt" /><small>默认密码:admin,建议 <a href="javascript:randpwd();">手动生成</a></small></td>
<td><input name="adminpwd" type="text" value="admin" class="input-txt" /><small>默认密码:admin,建议 <a class="btn btn-success btn-sm" href="javascript:randpwd();">手动生成</a></small></td>
</tr>
<tr>
<td class="onetd"><strong>Cookie加密码:</strong></td>
@@ -206,8 +187,8 @@
</table>
<div class="btn-box">
<input type="button" class="btn-back" value="后退" onclick="window.location.href='index.php?step=2';" />
<input type="button" class="btn-next" value="开始安装" onclick="DoInstall();" />
<button type="button" class="btn btn-success" onclick="window.location.href='index.php?step=2';">后退</button>
<button type="button" class="btn btn-success" onclick="DoInstall();">开始安装</button>
</div>
</div>
</div>


+ 10
- 9
src/install/templates/step-5.html View File

@@ -3,6 +3,8 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $s_lang?>" />
<title>安装程序 - 织梦内容管理系统<?php echo $verMsg; ?></title>
<link rel="stylesheet" href="../static/css/bootstrap.min.css">
<link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="style.css" rel="stylesheet" type="text/css" />
</head>
<body>
@@ -13,10 +15,10 @@
</div>
<div class="top-link">
<ul>
<li><a href="https://www.dedebiz.com" target="_blank">商业支持</a></li>
<li><a href="https://www.dedebiz.com/git" target="_blank">代码托管</a></li>
<li><a href="http://www.dedebiz.com/help" target="_blank">帮助中心</a></li>
<li><a href="http://www.dedecms.com" target="_blank">官方网站</a></li>
<li><a href="http://bbs.dedecms.com" target="_blank">技术论坛</a></li>
<li><a href="https://www.zhelixie.com/DesDev" target="_blank">代码</a></li>
<li><a href="http://help.dedecms.com" target="_blank">帮助</a></li>
</ul>
</div>
<div class="top-version">
@@ -48,17 +50,16 @@
<?php echo $errmsg; ?>
</div>
<div class="over-link">
<a href="../dede" target="_blank">管理后台</a>
<a href="../index.php?upcache=1" target="_blank">网站首页</a>
<a href="../dede" target="_blank" class="btn btn-success">管理后台</a>
<a href="../index.php?upcache=1" target="_blank" class="btn btn-success">网站首页</a>
</div>
<div class="install-msg">
或者访问织梦网站:<br />
</div>
<div class="over-link">
<a href="http://www.dedecms.com" target="_blank">织梦官方网站</a>
<a href="http://bbs.dedecms.com" target="_blank">织梦论坛</a>
<a href="http://help.dedecms.com" target="_blank">帮助中心</a>
<a href="https://www.zhelixie.com/DesDev" target="_blank">DedeCMS代码(国内)</a>
<a href="https://www.dedebiz.com" target="_blank" class="btn btn-success">商业支持</a>
<a href="https://www.dedebiz.com/git" target="_blank" class="btn btn-success">代码托管</a>
<a href="http://www.dedebiz.com/help" target="_blank" class="btn btn-success">帮助中心</a>
</div>
</div>
</div>


BIN
src/static/ad1.jpg View File

Before After
Width: 252  |  Height: 180  |  Size: 61KB

BIN
src/static/ad2.jpg View File

Before After
Width: 252  |  Height: 180  |  Size: 73KB

BIN
src/static/banner01.gif View File

Before After
Width: 500  |  Height: 60  |  Size: 29KB

BIN
src/static/banner02.gif View File

Before After
Width: 200  |  Height: 60  |  Size: 8.9KB

BIN
src/static/banner02.jpg View File

Before After
Width: 200  |  Height: 60  |  Size: 8.7KB

BIN
src/static/dede.gif View File

Before After
Width: 100  |  Height: 25  |  Size: 2.8KB

Loading…
Cancel
Save