diff --git a/src/dede/css/base.css b/src/dede/css/base.css index 247fec98..560cb993 100755 --- a/src/dede/css/base.css +++ b/src/dede/css/base.css @@ -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 { diff --git a/src/include/helpers/channelunit.helper.php b/src/include/helpers/channelunit.helper.php index 0c08a887..f0c130a6 100755 --- a/src/include/helpers/channelunit.helper.php +++ b/src/include/helpers/channelunit.helper.php @@ -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"); } diff --git a/src/install/images/top-logo.png b/src/install/images/top-logo.png old mode 100755 new mode 100644 index 3d7b5f9a..26182bab Binary files a/src/install/images/top-logo.png and b/src/install/images/top-logo.png differ diff --git a/src/install/style.css b/src/install/style.css index 66a30868..cd973649 100755 --- a/src/install/style.css +++ b/src/install/style.css @@ -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; diff --git a/src/install/templates/step-1.html b/src/install/templates/step-1.html index 9f71f150..6eb03f52 100755 --- a/src/install/templates/step-1.html +++ b/src/install/templates/step-1.html @@ -3,7 +3,13 @@ 安装程序 - 织梦内容管理系统<?php echo $verMsg; ?> + + + + + + @@ -13,10 +19,10 @@
@@ -69,7 +75,7 @@
- +
diff --git a/src/install/templates/step-2.html b/src/install/templates/step-2.html index 7ac4202f..688e1bb3 100755 --- a/src/install/templates/step-2.html +++ b/src/install/templates/step-2.html @@ -3,6 +3,8 @@ 安装程序 - 织梦内容管理系统<?php echo $verMsg; ?> + + @@ -14,10 +16,10 @@
@@ -70,7 +72,7 @@

系统环境检测

-
+
系统环境要求必须满足下列所有条件，否则系统或系统部份功能将无法使用。
@@ -104,7 +106,7 @@

目录权限检测

-
+
系统要求必须满足下列所有的目录权限全部可读写的需求才能使用，其它应用目录可安装后在管理后台检测。
@@ -132,8 +134,8 @@
- - + +
diff --git a/src/install/templates/step-3.html b/src/install/templates/step-3.html index c6418481..9a03c87f 100755 --- a/src/install/templates/step-3.html +++ b/src/install/templates/step-3.html @@ -5,7 +5,6 @@ 安装程序 - 织梦内容管理系统<?php echo $verMsg; ?> + + @@ -56,10 +56,10 @@
@@ -84,25 +84,6 @@
-

模块选择

- - - - -
- 默认已安装模块(不需要可在后台卸载)：
- 百度新闻、文件管理器、挑错管理、投票模块、友情链接
- 已下载并可选安装的：（不能选中的为未下载）
-
disabled = 'true' value='0a7bea5dbe571d35def883cbec796437' /> 留言簿模块
-
disabled = 'true' value='59155be87ea60c5c65ec1f7a46a0fc9d' /> 手机WAP浏览
-
disabled = 'true' value='7badb72a3ff79af2a7112beee60cb970' /> 小说模块
-
disabled = 'true' value='867af26e9c1ccf22a1cf67e756cf5acc' /> 黄页模块
-
disabled = 'true' value='8964eda9013d1df0afea08ed63243436' /> 站内新闻
-
disabled = 'true' value='be722dbfa3cb3cb5628aab2d767ff62e' /> 问答模块
-
disabled = 'true' value='dfcb5cd4d7bc0e3f7eb655e62dd6bc64' /> 圈子模块
-
disabled = 'true' value='c10bb6ac52082ab3e669b4814b44a6f1' /> 邮件订阅
-
disabled = 'true' value='8a4773468b800900dcfefbc5988833ed' /> UCenter模块
-

数据库设定

@@ -175,7 +156,7 @@ - + @@ -206,8 +187,8 @@
密　码：默认密码：admin，建议 手动生成默认密码：admin，建议 手动生成
Cookie加密码：
- - + +
diff --git a/src/install/templates/step-5.html b/src/install/templates/step-5.html index 4fbb46cc..28443f93 100755 --- a/src/install/templates/step-5.html +++ b/src/install/templates/step-5.html @@ -3,6 +3,8 @@ 安装程序 - 织梦内容管理系统<?php echo $verMsg; ?> + + @@ -13,10 +15,10 @@
@@ -48,17 +50,16 @@
- 管理后台 - 网站首页 + 管理后台 + 网站首页
或者访问织梦网站:
- 织梦官方网站 - 织梦论坛 - 帮助中心 - DedeCMS代码（国内） + 商业支持 + 代码托管 + 帮助中心
diff --git a/src/static/ad1.jpg b/src/static/ad1.jpg deleted file mode 100755 index 94882d06..00000000 Binary files a/src/static/ad1.jpg and /dev/null differ diff --git a/src/static/ad2.jpg b/src/static/ad2.jpg deleted file mode 100755 index bec547ef..00000000 Binary files a/src/static/ad2.jpg and /dev/null differ diff --git a/src/static/banner01.gif b/src/static/banner01.gif deleted file mode 100755 index 927d6a13..00000000 Binary files a/src/static/banner01.gif and /dev/null differ diff --git a/src/static/banner02.gif b/src/static/banner02.gif deleted file mode 100755 index 9a4469be..00000000 Binary files a/src/static/banner02.gif and /dev/null differ diff --git a/src/static/banner02.jpg b/src/static/banner02.jpg deleted file mode 100755 index 0156b3d7..00000000 Binary files a/src/static/banner02.jpg and /dev/null differ diff --git a/src/static/dede.gif b/src/static/dede.gif deleted file mode 100755 index 40ed57f3..00000000 Binary files a/src/static/dede.gif and /dev/null differ