diff --git a/dedebiz b/dedebiz index 74377b1f..33d6a7c3 100755 --- a/dedebiz +++ b/dedebiz @@ -24,7 +24,7 @@ USAGE: php ./dedebiz command [arguments...] COMMANDS: serv,s 运行DedeBIZ开发服务 - make,m 生成HTML + make,m 更新网页 update,u 更新到最新系统 help,h Shows 帮助 quick,q 快速开始一个开发环境 @@ -109,7 +109,7 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { DedeCli::showProgress(ceil(($i / $total) * 100), 100, $i, $total); $i++; } - DedeCli::write("成功生成内容html"); + DedeCli::write("成功更新文档页"); $queryTime = ExecTime() - $t1; DedeCli::write($queryTime); exit; @@ -129,7 +129,7 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { $lv = new SgListView($row->id); } $lv->CountRecord(); - DedeCli::write("开始生成列表html[id:{$row->id}]"); + DedeCli::write("开始更新列表页[id:{$row->id}]"); $lv->MakeHtml('', '', 0); } exit; @@ -153,7 +153,7 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { $GLOBALS['_arclistEnv'] = 'index'; $pv->SetTemplet($cfg_basedir . $cfg_templets_dir . "/" . $templet); $pv->SaveToHtml($homeFile); - DedeCli::write("成功生成首页html"); + DedeCli::write("成功更新首页"); } else if (count($argv) > 2 && ($argv[2] == "auto" || $argv[2] == "o")) { //自动生成 function OptimizeData($dsql) @@ -190,7 +190,7 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { } else { if (file_exists($homeFile)) @unlink($homeFile); } - DedeCli::write("成功生成首页html"); + DedeCli::write("成功更新首页"); //2.生成栏目 $query = "SELECT DISTINCT typeid From `#@__arctiny` WHERE senddate >=" . $start . " AND arcrank>-1"; $dsql->SetQuery($query); @@ -220,10 +220,10 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { $lv = new SgListView($tt); } $lv->CountRecord(); - DedeCli::write("开始生成列表html[id:{$tt}]"); + DedeCli::write("开始更新列表页[id:{$tt}]"); $lv->MakeHtml('', '', 0); } - DedeCli::write("成功生成列表html"); + DedeCli::write("成功更新列表页"); } //生成文档 $tt = $dsql->GetOne("SELECT COUNT(id) as dd FROM `#@__arctiny` WHERE senddate >=" . $start . " AND arcrank>-1"); @@ -237,7 +237,7 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { DedeCli::showProgress(ceil(($i / $total) * 100), 100); $i++; } - DedeCli::write("成功生成html"); + DedeCli::write("成功更新网页"); //优化数据 OptimizeData($dsql); DedeCli::write("成功优化数据"); @@ -246,16 +246,16 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { USAGE: php ./dedebiz make action [arguments...] ACTIONS: - index,i 生成首页html - --position 首页html位置,默认: ../index.html(相对system目录) - arc,a 生成文档html + index,i 更新首页 + --position 首页位置,默认: ../index.html(相对system目录) + arc,a 更新文档页 --typeid 栏目id --aid 文档id - list,l 生成列表html + list,l 更新列表页 --typeid 栏目id - auto,o 自动生成 + auto,o 自动更新 --start 开始时间(format:2012-03-12) - tdata 生成测试数据 + tdata 更新测试数据 WEBSITE: https://www.dedebiz.com/help/"; DedeCli::write($helpStr); diff --git a/src/admin/css/login.min.css b/src/admin/css/login.min.css index 20739569..6f7f71a4 100644 --- a/src/admin/css/login.min.css +++ b/src/admin/css/login.min.css @@ -1 +1 @@ -body{line-height:1.6;letter-spacing:.6px;font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#f5f5f5}a{color:#545b62}a:hover{color:#ff8400;text-decoration:none}h2{line-height:1.6;font-size:24px;color:#393d49;font-weight:600}.btn,input,select{font-size:14px!important}.admin-head{padding:1rem 0;background:#fff}.logo,.form-control{height:36px}.admin-nav{height:36px;line-height:36px}.admin-nav-a{padding-right:30px}.admin-btn{color:#545b62}.dropdown-menu{min-width:8rem;font-size:14px}.dropdown-item{padding:0 1rem;height:30px;line-height:30px;font-size:14px;color:#545b62!important}.login-from{margin:0 auto;width:500px}.login-box{padding:1.25rem;background:#fff;border-radius:.5rem}.login-power{padding-top:1rem}.form-control,.btn-md,.alert,.rounded{border-radius:.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 .5rem .5rem 0;cursor:pointer}#browsehappy{padding:20px 30px;font-size:14px;line-height:16px;color:#856404;background:#fff3cd;border-radius:.25rem;border:0}.browsehappy-close{float:right;cursor:pointer}@media (max-width:760px){.admin-head{padding:1rem 15px}.admin-nav-a{display:none!important}.login-from{width:100%}} \ No newline at end of file +body{line-height:1.6;letter-spacing:.6px;font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#f5f5f5}a{color:#545b62}a:hover{color:#ff8400;text-decoration:none}h2{line-height:1.6;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:0 auto;width:500px}.login-box{padding:1.25rem;background:#fff;border-radius:.5rem}.login-power{padding-top:1rem}.form-control,.btn-md,.alert,.rounded{border-radius:.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 .5rem .5rem 0;cursor:pointer}#browsehappy{padding:20px 30px;font-size:14px;line-height:16px;color:#856404;background:#fff3cd;border-radius:.25rem;border:0}.browsehappy-close{float:right;cursor:pointer}@media (max-width:760px){.admin-head{padding:1rem 15px}.admin-nav-a{display:none!important}.login-from{width:100%}} \ No newline at end of file diff --git a/src/admin/sys_admin_user_add.php b/src/admin/sys_admin_user_add.php index fec4c469..a4f4f7f4 100644 --- a/src/admin/sys_admin_user_add.php +++ b/src/admin/sys_admin_user_add.php @@ -15,7 +15,7 @@ if (empty($dopost)) $dopost = ''; if ($dopost == 'add') { CheckCSRF(); if (preg_match("#[^0-9a-zA-Z_@!\.-]#", $pwd) || preg_match("#[^0-9a-zA-Z_@!\.-]#", $userid)) { - ShowMsg('密码或或会员名不合法，
只能用[0-9a-zA-Z_@!.-]以内范围的字符', '-1', 0, 3000); + ShowMsg('密码或或会员名不合法，只能用[0-9a-zA-Z_@!.-]以内范围的字符', '-1', 0, 3000); exit(); } $safecodeok = substr(md5($cfg_cookie_encode.$randcode), 0, 24); diff --git a/src/admin/sys_admin_user_tj.php b/src/admin/sys_admin_user_tj.php index 60152018..bdae6f61 100644 --- a/src/admin/sys_admin_user_tj.php +++ b/src/admin/sys_admin_user_tj.php @@ -1,6 +1,6 @@ GetOne("SELECT COUNT(id) AS dd,SUM(click) AS cc FROM `#@__archives` WHERE senddate>$istarttime AND mid='$uid';"); $ddm = $row['dd'] + $ddm; $ccm = $row['cc'] + $ccm; - //本周 + //七天 $starttime = $y."-{$m}-{$d} 00:00:00"; $istarttime = GetMkTime($starttime) - (7 * 24 * 3600); $sql = "SELECT addtable FROM `#@__channeltype` WHERE issystem='-1'"; @@ -93,12 +93,16 @@ if (isset($dopost) && $dopost == 'getone') { $row = $dsql->GetOne("SELECT COUNT(id) AS dd,SUM(click) AS cc FROM `#@__archives` WHERE senddate>$istarttime AND mid='$uid';"); $ddd = $row['dd'] + $ddd; $ccd = $row['cc'] + $ccd; - $msg = "管理员：{$userid} - 文档/点击：{$dd}/{$cc} - 季度：{$dds}/{$ccs} - 当月：{$ddm}/{$ccm} - 近七天：{$ddw}/{$ccw} - 当天：{$ddd}/{$ccd}"; + $msg = "
+
+
管理员：{$userid}
+
文档/点击：{$dd}/{$cc}
+
季度：{$dds}/{$ccs}
+
当月：{$ddm}/{$ccm}
+
七天：{$ddw}/{$ccw}
+
当天：{$ddd}/{$ccd}
+
+
"; AjaxHead(); echo $msg; exit(); diff --git a/src/admin/sys_info.php b/src/admin/sys_info.php index 31c085d5..b2d879b3 100644 --- a/src/admin/sys_info.php +++ b/src/admin/sys_info.php @@ -104,9 +104,9 @@ else if ($dopost == 'search') { 系统配置变量搜索 - 参数说明 + 参数说明 参数值 - 变量名 + 变量名 EOT; echo $configstr; diff --git a/src/admin/templets/catalog_add.htm b/src/admin/templets/catalog_add.htm index a874c901..cb2661c1 100644 --- a/src/admin/templets/catalog_add.htm +++ b/src/admin/templets/catalog_add.htm @@ -39,7 +39,7 @@ function ShowObj(objname) { var obj = document.getElementById(objname); if (Nav() == 'IE') obj.style.display = "block"; - else obj.style.display = "table"; + else obj.style.display = "block"; } function HideObj(objname) { var obj = document.getElementById(objname); @@ -49,7 +49,7 @@ var upinyin = document.getElementById('upinyin'); var tpobj = document.getElementById('typedir'); if (upinyin.checked) tpobj.style.display = "none"; - else tpobj.style.display = "block"; + else tpobj.style.display = "inline-block"; } function ParTemplet(obj) { var sevvalue = channelArray[obj.value]; @@ -64,7 +64,7 @@ temparticle[0].value = dfstyleValue + "/article_" + sevvalue + ".htm"; if (obj.value < 0) { if (Nav() == 'IE') tobj.style.display = "block"; - else tobj.style.display = "table-row"; + else tobj.style.display = "block"; } else { tobj.style.display = "none"; } @@ -126,6 +126,7 @@ 文档模型： + - +
+ + （支持多选） +
上级目录： @@ -199,13 +218,9 @@ 文件保存目录： - - - - - - -
+ + + 目录相对位置： @@ -321,31 +336,17 @@ 栏目描述： （标签“{dede:field.description/}”调用） - - 绑定小分类 + + 是否支持跨站数据： - - （支持多选） + + + - + diff --git a/src/admin/templets/catalog_add_quick.htm b/src/admin/templets/catalog_add_quick.htm index 8ad988dd..d2757ba7 100644 --- a/src/admin/templets/catalog_add_quick.htm +++ b/src/admin/templets/catalog_add_quick.htm @@ -177,7 +177,7 @@ 排序 顶级栏目名称 - 子类栏目名称（目录名称1,目录名称2） + 子栏目名称（名称1,名称2） diff --git a/src/admin/templets/catalog_edit.htm b/src/admin/templets/catalog_edit.htm index cf4536ec..a8afd3f1 100644 --- a/src/admin/templets/catalog_edit.htm +++ b/src/admin/templets/catalog_edit.htm @@ -39,7 +39,7 @@ function ShowObj(objname) { var obj = document.getElementById(objname); if (Nav() == 'IE') obj.style.display = "block"; - else obj.style.display = "table"; + else obj.style.display = "block"; } function HideObj(objname) { var obj = document.getElementById(objname); @@ -49,7 +49,7 @@ var upinyin = document.getElementById('upinyin'); var tpobj = document.getElementById('typedir'); if (upinyin.checked) tpobj.style.display = "none"; - else tpobj.style.display = "block"; + else tpobj.style.display = "inline-block"; } function ParTemplet(obj) { var sevvalue = channelArray[obj.value]; @@ -64,7 +64,7 @@ temparticle[0].value = dfstyleValue + "/article_" + sevvalue + ".htm"; if (obj.value < 0) { if (Nav() == 'IE') tobj.style.display = "block"; - else tobj.style.display = "table-row"; + else tobj.style.display = "block"; } else { tobj.style.display = "none"; } @@ -109,6 +109,7 @@ 文档模型： + - +
+ + （支持多选） +
上级目录： @@ -284,32 +309,12 @@ 栏目描述： （标签“{dede:field.description/}”调用） - - 绑定小分类： + + 是否支持跨站数据： - - （支持多选） + + + diff --git a/src/admin/templets/catalog_main.htm b/src/admin/templets/catalog_main.htm index c819229f..6206f4fe 100644 --- a/src/admin/templets/catalog_main.htm +++ b/src/admin/templets/catalog_main.htm @@ -52,7 +52,7 @@ - + diff --git a/src/admin/templets/member_main.htm b/src/admin/templets/member_main.htm index 7bc00144..596d757a 100644 --- a/src/admin/templets/member_main.htm +++ b/src/admin/templets/member_main.htm @@ -57,12 +57,12 @@ - + - + + - {dede:datalist empty=''} @@ -80,11 +80,11 @@ 金币：{dede:field.money/}余额：{dede:field.user_money/} - +
网站栏目管理网站栏目管理
选择 mid头像/会员名头像/会员名 昵称 等级钱包积分钱包积分地址/时间 投稿限制地址/时间 操作
暂无会员
{dede:field.send_max/} {dede:field.loginip/} {dede:field.logintime function="MyDate('Y-m-d H:i:s',@me)"/} {dede:field.send_max/} 提升 文档 diff --git a/src/admin/templets/member_toadmin.htm b/src/admin/templets/member_toadmin.htm index d304c474..2694fc5a 100644 --- a/src/admin/templets/member_toadmin.htm +++ b/src/admin/templets/member_toadmin.htm @@ -69,7 +69,7 @@
授权栏目： - diff --git a/src/admin/templets/sys_admin_user_add.htm b/src/admin/templets/sys_admin_user_add.htm index def20038..15546741 100644 --- a/src/admin/templets/sys_admin_user_add.htm +++ b/src/admin/templets/sys_admin_user_add.htm @@ -70,7 +70,7 @@
授权栏目： - diff --git a/src/admin/templets/sys_admin_user_edit.htm b/src/admin/templets/sys_admin_user_edit.htm index 2c51653f..47aa61ac 100644 --- a/src/admin/templets/sys_admin_user_edit.htm +++ b/src/admin/templets/sys_admin_user_edit.htm @@ -49,7 +49,7 @@
授权栏目： - diff --git a/src/admin/templets/sys_admin_user_tj.htm b/src/admin/templets/sys_admin_user_tj.htm index 6d5b6590..cdc54cc6 100644 --- a/src/admin/templets/sys_admin_user_tj.htm +++ b/src/admin/templets/sys_admin_user_tj.htm @@ -17,7 +17,7 @@ if (resp.ok) { return resp.text() } - throw new Error('载入失败'); + throw new Error('加载失败'); }).then((d)=>{ ajaxdiv.innerHTML = d; }).catch((error) => { diff --git a/src/install/install.html b/src/install/install.html index 4be079ff..0aef654a 100644 --- a/src/install/install.html +++ b/src/install/install.html @@ -11,7 +11,7 @@ - +
@@ -105,7 +105,7 @@
-

Powered by DedeBIZ开发团队

+

Powered by DedeBIZ开发团队