From 82c45a93c138f33c631a74ce1648683b91795d7d Mon Sep 17 00:00:00 2001 From: xushubieli Date: Fri, 29 Oct 2021 14:19:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=A3=B0=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 18 +-- dedebiz | 26 ++--- src/dede/css/base.css | 6 +- src/dede/css/frame.css | 24 ++-- src/dede/dialog/select_images.php | 4 +- src/dede/dialog/select_soft.php | 2 +- src/dede/dialog/select_templets.php | 2 +- src/dede/inc/inc_action_info.php | 2 +- src/dede/templets/index2.htm | 149 ++++++++++-------------- src/dede/templets/index_menu2.htm | 11 +- src/dede/testenv.php | 2 +- src/dede/tpl.php | 2 +- src/install/index.php | 2 +- src/install/sql-dfdata.txt | 2 +- src/install/templates/step-1.html | 6 +- src/member/index_do.php | 2 +- src/member/templets/footer.htm | 2 +- src/plus/recommend.php | 2 +- src/templets/default/advancedsearch.htm | 2 +- src/templets/default/footer.htm | 2 +- src/templets/plus/plus_footer.htm | 2 +- src/templets/plus/rssmap.htm | 2 +- src/templets/plus/sitemap.htm | 2 +- src/templets/plus/view_msg_catalog.htm | 2 +- 24 files changed, 123 insertions(+), 153 deletions(-) diff --git a/README.md b/README.md index 28beaf88..e1e18e2e 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -# DedeCMSV6 +# DedeBIZ -国内流行的内容管理系统（CMS）多端全媒体解决方案，DedeCMSV6系统基于PHP7.X开发，具有很强的可扩展性，并且完全开放源代码。DedeBIZ商业支持采用现流行的Go语言设计开发，让DedeCMS系统拥有简单易用、灵活扩展特性之外更安全、高效。模板设计制作简单一直是系统的一大特点，全新的版本延续了之前标签引擎，同时采用响应式模板引擎Bootstrap作为系统模板渲染引擎，让搭建跨终端（移动、PC）全媒体站点更简单。 +国内流行的内容管理系统（CMS）多端全媒体解决方案，DedeBIZ系统基于PHP7.X开发，具有很强的可扩展性，并且完全开放源代码。DedeBIZ商业支持采用现流行的Go语言设计开发，让DedeCMS系统拥有简单易用、灵活扩展特性之外更安全、高效。模板设计制作简单一直是系统的一大特点，全新的版本延续了之前标签引擎，同时采用响应式模板引擎Bootstrap作为系统模板渲染引擎，让搭建跨终端（移动、PC）全媒体站点更简单。 ## 版本说明 -DedeCMSV6.x是一个LTS版本，支持将到2022年10月截止，目前DedeCMSV6已经发布，可以[点击下载](https://www.dedebiz.com/download)获取。 +DedeBIZ.x是一个LTS版本，支持将到2022年10月截止，目前DedeBIZ已经发布，可以[点击下载](https://www.dedebiz.com/download)获取。 ## 参与开源 @@ -14,7 +14,7 @@ DedeCMSV6.x是一个LTS版本，支持将到2022年10月截止，目前DedeCMSV6 我们将会收集、整理新的功能需求制定新的Roadmap。 -[开发者](https://www.dedebiz.com/developer)可以到[工单管理](https://www.zhelixie.com/DedeBiz/DedeCMSV6/issues)中进行交流反馈。 +[开发者](https://www.dedebiz.com/developer)可以到[工单管理](https://www.zhelixie.com/DedeBiz/DedeBIZ/issues)中进行交流反馈。 普通用户可以通过微信公众号或者邮件的方式进行反馈，详见本页底部资源。 @@ -95,8 +95,8 @@ NAME: USAGE: php ./dedebiz command [arguments...] COMMANDS: - serv,s Run cli web server for DedeCMSV6 - make,m Make DedeCMSV6 HTML + serv,s Run cli web server for DedeBIZ + make,m Make DedeBIZ HTML update,u Update to latest system help,h Shows a list of commands or help quick,q Quick start a development environment @@ -112,13 +112,13 @@ WEBSITE: ## 版权信息 -详细参考：[DedeCMSV6站点授权协议](https://www.dedebiz.com/license) +详细参考：[DedeBIZ站点授权协议](https://www.dedebiz.com/license) -我们对DedeCMSV6系统授权的态度是“鼓励但不强制”，购买授权是对知识产权的尊重，是对我们技术服务的认可。 +我们对DedeBIZ系统授权的态度是“鼓励但不强制”，购买授权是对知识产权的尊重，是对我们技术服务的认可。 ## 相关资源 -- [DedeCMSV6](https://www.dedebiz.com) +- [DedeBIZ](https://www.dedebiz.com) - [帮助中心](https://www.dedebiz.com/help) diff --git a/dedebiz b/dedebiz index bb3f8571..a614add2 100755 --- a/dedebiz +++ b/dedebiz @@ -14,7 +14,7 @@ $workDir = dirname(__FILE__) . "/src"; chdir($workDir); if (substr(php_sapi_name(), 0, 3) === 'cgi') { - die("DedeCMSV6:needs php-cli to run\n\n"); + die("DedeBIZ:needs php-cli to run\n\n"); } $helpStr = " @@ -23,8 +23,8 @@ NAME: USAGE: php ./dedebiz command [arguments...] COMMANDS: - serv,s Run cli web server for DedeCMSV6 - make,m Make DedeCMSV6 HTML + serv,s Run cli web server for DedeBIZ + make,m Make DedeBIZ HTML update,u Update to latest system help,h Shows a list of commands or help quick,q Quick start a development environment @@ -75,9 +75,9 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { // PHP5.4以下不支持内建服务器 // 用于开发调试 if (phpversion() < "5.4") { - die("DedeCMSV6:command web server not support\n\n"); + die("DedeBIZ:command web server not support\n\n"); } - echo "Start Dev Server For DedeCMSV6\n\r"; + echo "Start Dev Server For DedeBIZ\n\r"; echo "Open http://localhost:8088\n\r"; passthru(PHP_BINARY . ' -S localhost:8088 -t' . escapeshellarg('./')); } else if (count($argv) > 1 && ($argv[1] == "make" || $argv[1] == "m")) { @@ -296,23 +296,23 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { } else if (count($argv) > 1 && ($argv[1] == "quick" || $argv[1] == "q")){ define("DEDEINC", $workDir."/include"); require_once(DEDEINC . "/cli.class.php"); - // 快速开始一个用于开发的DedeCMSV6环境，基于SQLite无其他依赖 - if (file_exists($workDir."/data/dedecmsv6.db")) { + // 快速开始一个用于开发的DedeBIZ环境，基于SQLite无其他依赖 + if (file_exists($workDir."/data/DedeBIZ.db")) { DedeCli::write("development environment has inited"); - echo "Start Dev Server For DedeCMSV6\n\r"; + echo "Start Dev Server For DedeBIZ\n\r"; echo "Open http://localhost:8088\n\r"; passthru(PHP_BINARY . ' -S localhost:8088 -t' . escapeshellarg('./')); exit; } // 初始化安装一个开发环境 - $db = new SQLite3($workDir.'/data/dedecmsv6.db'); + $db = new SQLite3($workDir.'/data/DedeBIZ.db'); $fp = fopen($workDir."/install/common.inc.php","r"); $configStr1 = fread($fp,filesize($workDir."/install/common.inc.php")); fclose($fp); @chmod($workDir."/data",0777); $dbtype = "sqlite"; $dbhost = ""; - $dbname = "dedecmsv6"; + $dbname = "DedeBIZ"; $dbuser = ""; $dbpwd = ""; $dbprefix = "dede_"; @@ -334,7 +334,7 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { $baseurl = "http://127.0.0.1:8088"; $indexUrl = "/"; $cmspath = ""; - $webname = "DedeCMSV6本地测试开发站点"; + $webname = "DedeBIZ本地测试开发站点"; $adminmail = "admin@dedebiz.com"; $fp = fopen($workDir."/install/config.cache.inc.php","r"); @@ -459,9 +459,9 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { Values('1','10','0','{$adminuser}的空间','','person','',''); "; $db->exec($adminquery); if (phpversion() < "5.4") { - die("DedeCMSV6:command web server not support\n\n"); + die("DedeBIZ:command web server not support\n\n"); } - echo "Start Dev Server For DedeCMSV6\n\r"; + echo "Start Dev Server For DedeBIZ\n\r"; echo "Open http://localhost:8088\n\r"; passthru(PHP_BINARY . ' -S localhost:8088 -t' . escapeshellarg('./')); exit; diff --git a/src/dede/css/base.css b/src/dede/css/base.css index b6b76e1d..52e4f85e 100644 --- a/src/dede/css/base.css +++ b/src/dede/css/base.css @@ -48,8 +48,6 @@ input,input[type=text],input[type=password] { border:1px solid #eee } input[type=checkbox],input[type=radio] { - width:14px; - height:14px; vertical-align:bottom } textarea { @@ -433,10 +431,10 @@ option.stype { cursor:pointer } .maintable { - width:98% !important + width:98%!important } a.btn { - color:white !important + color:white!important } span.page-link { background-color:#ddd diff --git a/src/dede/css/frame.css b/src/dede/css/frame.css index 5d0ee5f4..66be7fb6 100644 --- a/src/dede/css/frame.css +++ b/src/dede/css/frame.css @@ -45,7 +45,7 @@ form { margin-left:10px; height:46px; line-height:46px; - font-size:24px; + font-size:18px; font-weight:600; color:#fff } @@ -63,10 +63,12 @@ form { line-height:46px; overflow:hidden } -.top .top_link ul li.welcome { - border-right:none; - color:#fff; - padding-right:10px +.top .top_link ul li.welcome img { + margin-top:-2px; + margin-right:10px; + width:30px; + height:30px; + vertical-align:middle } .top .top_link ul li { float:left; @@ -79,8 +81,7 @@ form { text-decoration:none } .top .top_link ul li a:hover { - color:#fff; - text-decoration:underline + color:#ccc } .top .top_link .quick { padding:3px 0px 0px 0px; @@ -313,19 +314,18 @@ body.hidemenu .right { display:none } .allmenu { - width:720px; + width:800px; background:#fff; border:2px solid #999; z-index:999; position:absolute; left:50%; - top:38px; - margin-left:-350px; + top:76px; + margin-left:-400px; display:none; padding:10px } .allmenu .allmenu-box { - width:720px; margin:0 auto; text-align:left; overflow:hidden; @@ -333,7 +333,7 @@ body.hidemenu .right { } .maptop { float:left; - width:108px; + width:130px; overflow:hidden; padding-right:6px; padding-left:6px; diff --git a/src/dede/dialog/select_images.php b/src/dede/dialog/select_images.php index f633d7ec..b1d5c949 100644 --- a/src/dede/dialog/select_images.php +++ b/src/dede/dialog/select_images.php @@ -73,7 +73,7 @@ table{background:#fff}
- 关闭预览 + 关闭预览
- - - -
-
+ echo $mapstring; + ?> +
@@ -87,36 +71,30 @@
-
隐藏菜单 - 隐藏菜单 + getUserType() >= 10) echo '功能地图'; ?>
-
-
- +
-
- +

滚动消息:

- + 代码托管 帮助中心 @@ -187,5 +165,4 @@ })(jQuery); - \ No newline at end of file diff --git a/src/dede/templets/index_menu2.htm b/src/dede/templets/index_menu2.htm index eddb5074..adaae2b5 100644 --- a/src/dede/templets/index_menu2.htm +++ b/src/dede/templets/index_menu2.htm @@ -21,9 +21,6 @@ div { padding:0; margin:0 } -.sitemu a { - font-size:12px -} dl.bitem { clear:both; width:140; @@ -62,18 +59,16 @@ div.items { padding-top:2px; float:left } -li { - height:24px -} .sitemu li { padding:0 0 0 18px; + height:24px; line-height:24px; background:url(images/arr4.gif) no-repeat 5px 9px } a.mmac div { background:url(images/leftbg2.gif) no-repeat; height:38px!important; - padding:8px 4px 4px 10; + padding:8px 4px 4px 10px; word-wrap:break-word; word-break:break-all; font-weight:600; @@ -82,7 +77,7 @@ a.mmac div { a.mm div { background:url(images/leftmbg1.gif) no-repeat; height:38px!important; - padding:8px 4px 4px 10; + padding:8px 4px 4px 10px; word-wrap:break-word; word-break:break-all; font-weight:600; diff --git a/src/dede/testenv.php b/src/dede/testenv.php index ecb6fba4..6552fd99 100755 --- a/src/dede/testenv.php +++ b/src/dede/testenv.php @@ -268,7 +268,7 @@ $action = isset($action) ? $action : '';
系统运行目录权限检测返回主页帮助说明
-
说明：本程序用于检测DedeCMSV6站点所涉及的目录权限，并且提供一个全面的检测说明，您可以根据检测报告来配置站点以保证站点更为安全。
+
说明：本程序用于检测DedeBIZ站点所涉及的目录权限，并且提供一个全面的检测说明，您可以根据检测报告来配置站点以保证站点更为安全。
diff --git a/src/dede/tpl.php b/src/dede/tpl.php index 783dfb5c..160bbd06 100755 --- a/src/dede/tpl.php +++ b/src/dede/tpl.php @@ -152,7 +152,7 @@ function _upload() {} exit(); } else { if (!preg_match("#\.(htm|html)$#", $upfile_name)) { - ShowMsg("DedeCMSV6模板只能用 .htm 或 .html扩展名！", "-1"); + ShowMsg("DedeBIZ模板只能用 .htm 或 .html扩展名！", "-1"); exit(); } if (preg_match("#[\\\\\/]#", $upfile_name)) { diff --git a/src/install/index.php b/src/install/index.php index 4ee8da8f..93cd95ad 100644 --- a/src/install/index.php +++ b/src/install/index.php @@ -11,7 +11,7 @@ error_reporting(E_ALL || ~E_NOTICE); $verMsg = 'V6'; -$dfDbname = 'dedecmsv6'; +$dfDbname = 'DedeBIZ'; $cfg_version_detail = '6.0.3'; // 详细版本号 $errmsg = ''; diff --git a/src/install/sql-dfdata.txt b/src/install/sql-dfdata.txt index ac619df6..a3875b3c 100755 --- a/src/install/sql-dfdata.txt +++ b/src/install/sql-dfdata.txt @@ -513,7 +513,7 @@ INSERT INTO `#@__co_onepage` VALUES('5','www.dedebiz.com','DedeBIZ','1','gb2312' ('4','www.techweb.com.cn','Techweb','1','gb2312','
{@body}
\t\n'), ('6','tw.news.yahoo.com','台湾雅虎','1','big5','
{@body}
\t\n'); -INSERT INTO `#@__flink` (`sortrank`, `url`, `webname`, `msg`, `email`, `logo`, `dtime`, `typeid`, `ischeck`) VALUES (1, 'https://www.dedebiz.com', 'DedeCMSV6', '', '', '', 1226375403, 1, 2); +INSERT INTO `#@__flink` (`sortrank`, `url`, `webname`, `msg`, `email`, `logo`, `dtime`, `typeid`, `ischeck`) VALUES (1, 'https://www.dedebiz.com', 'DedeBIZ', '', '', '', 1226375403, 1, 2); INSERT INTO `#@__flink` (`sortrank`, `url`, `webname`, `msg`, `email`, `logo`, `dtime`, `typeid`, `ischeck`) VALUES (1, 'https://www.dedebiz.com/help', '帮助中心', '', '', '', 1227772717, 1, 2); INSERT INTO `#@__flink` (`sortrank`, `url`, `webname`, `msg`, `email`, `logo`, `dtime`, `typeid`, `ischeck`) VALUES (1, 'https://www.dedebiz.com/auth', '授权中心', '', '', '', 1227772703, 1, 2); INSERT INTO `#@__flink` (`sortrank`, `url`, `webname`, `msg`, `email`, `logo`, `dtime`, `typeid`, `ischeck`) VALUES (3, 'https://www.dedebiz.com/git', '代码托管', '', '', '', 1603767210, 1, 1); diff --git a/src/install/templates/step-1.html b/src/install/templates/step-1.html index d9f1e497..0a22bca4 100755 --- a/src/install/templates/step-1.html +++ b/src/install/templates/step-1.html @@ -4,7 +4,7 @@ - 安装程序 - DedeCMSV6 - DedeBIZ技术支持 + <title>安装程序 - DedeBIZ - DedeBIZ技术支持 @@ -16,7 +16,7 @@
-
DedeCMSV6安装程序
+
DedeBIZ安装程序