From c01f16d5535b30c6d13a6101fba52a16f75a04f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?= <93301500+xushubieli@users.noreply.github.com> Date: Mon, 6 Feb 2023 15:12:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E9=92=AE=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/freelist_main.php | 6 +- src/admin/inc/inc_action_info.php | 2 +- src/admin/inc/inc_menu.php | 2 +- src/admin/member_toadmin.php | 2 +- src/admin/search_keywords_main.php | 40 +++--- src/admin/templets/catalog_main.htm | 6 +- src/admin/templets/content_i_list.htm | 12 +- src/admin/templets/content_list.htm | 10 +- src/admin/templets/content_s_list.htm | 8 +- src/admin/templets/content_select_list.htm | 6 +- src/admin/templets/content_sg_list.htm | 10 +- src/admin/templets/diy_main.htm | 6 +- src/admin/templets/feedback_main.htm | 10 +- src/admin/templets/file_manage_main.htm | 132 +++++++++--------- src/admin/templets/friendlink_main.htm | 4 +- src/admin/templets/index.htm | 5 +- src/admin/templets/log_list.htm | 2 +- src/admin/templets/makehtml_all.htm | 5 +- src/admin/templets/makehtml_archives.htm | 2 +- src/admin/templets/makehtml_homepage.htm | 12 +- src/admin/templets/makehtml_list.htm | 5 +- src/admin/templets/makehtml_spec.htm | 5 +- src/admin/templets/makehtml_taglist.htm | 5 +- src/admin/templets/media_main.htm | 2 +- src/admin/templets/member_main.htm | 39 ++++-- src/admin/templets/member_operations.htm | 2 +- src/admin/templets/member_toadmin.htm | 4 +- src/admin/templets/member_view.htm | 10 +- src/admin/templets/module_main.htm | 6 +- src/admin/templets/mychannel_main.htm | 20 +-- src/admin/templets/mytag_main.htm | 6 +- src/admin/templets/plus_main.htm | 4 +- src/admin/templets/recycling.htm | 4 +- src/admin/templets/stepselect_main.htm | 4 +- src/admin/templets/sys_admin_user.htm | 11 +- src/admin/templets/sys_cache_up.htm | 5 +- src/admin/templets/sys_data.htm | 26 ++-- src/admin/templets/sys_data_revert.htm | 2 +- src/admin/templets/sys_safetest.htm | 2 +- src/admin/templets/sys_sql_query.htm | 4 +- src/admin/templets/tags_main.htm | 8 +- src/admin/templets/templets_default.htm | 20 +-- src/admin/templets/templets_one.htm | 6 +- src/admin/templets/templets_tagsource.htm | 14 +- src/static/web/css/admin.css | 36 ++--- src/static/web/css/style.css | 81 +++++++++-- src/static/web/css/user.css | 67 --------- src/system/typelink/typeunit.class.admin.php | 76 +++++----- src/theme/dedebiz/index.htm | 2 +- src/theme/dedebiz/widget_article_feedback.htm | 2 +- src/theme/plus/recommend.htm | 6 +- src/user/templets/album_add.htm | 1 - src/user/templets/album_edit.htm | 1 - src/user/templets/archives_add.htm | 1 - src/user/templets/archives_edit.htm | 1 - src/user/templets/archives_sg_add.htm | 1 - src/user/templets/archives_sg_edit.htm | 1 - src/user/templets/article_add.htm | 1 - src/user/templets/article_edit.htm | 1 - src/user/templets/buy.htm | 1 - src/user/templets/buy_action_payment.htm | 1 - src/user/templets/content_list.htm | 9 +- src/user/templets/content_sg_list.htm | 9 +- src/user/templets/edit_baseinfo.htm | 1 - src/user/templets/edit_email.htm | 1 - src/user/templets/edit_face.htm | 1 - src/user/templets/index.htm | 1 - src/user/templets/login.htm | 1 - src/user/templets/mypay.htm | 1 - src/user/templets/mystow.htm | 1 - src/user/templets/operation.htm | 1 - src/user/templets/pm-main.htm | 1 - src/user/templets/reg-new.htm | 5 +- src/user/templets/resetpassword.htm | 1 - src/user/templets/resetpassword2.htm | 1 - src/user/templets/resetpassword3.htm | 1 - src/user/templets/soft_add.htm | 1 - src/user/templets/soft_edit.htm | 1 - 78 files changed, 406 insertions(+), 407 deletions(-) delete mode 100644 src/static/web/css/user.css diff --git a/src/admin/freelist_main.php b/src/admin/freelist_main.php index 1c855d57..973cfefa 100644 --- a/src/admin/freelist_main.php +++ b/src/admin/freelist_main.php @@ -82,9 +82,9 @@ function GetTagList($dsql,$pageno,$pagesize,$orderby='aid') {$row['click']} ".MyDate("y-m-d",$row['edtime'])." - 修改 - 更新 - 删除 + 修改 + 更新 + 删除 "; echo $line; diff --git a/src/admin/inc/inc_action_info.php b/src/admin/inc/inc_action_info.php index c0160d38..08f21819 100644 --- a/src/admin/inc/inc_action_info.php +++ b/src/admin/inc/inc_action_info.php @@ -376,7 +376,7 @@ $actionSearch[9] = array( 'linkurl' => 'sys_data.php' ), 9 => DEDEBIZ_SAFE_MODE? null : array( - 'title' => 'SQL命令行工具', + 'title' => 'SQL命令工具', 'description' => '数据表执行单行或者多行的SQL语句', 'purview' => 'sys_data', 'linkurl' => 'sys_sql_query.php' diff --git a/src/admin/inc/inc_menu.php b/src/admin/inc/inc_menu.php index 77c75bb0..712c0d7f 100644 --- a/src/admin/inc/inc_menu.php +++ b/src/admin/inc/inc_menu.php @@ -67,7 +67,7 @@ if ($cuserLogin->getUserType() >= 10) { ".(DEDEBIZ_SAFE_MODE? "" : "")." - ".(DEDEBIZ_SAFE_MODE? "" : "")." + ".(DEDEBIZ_SAFE_MODE? "" : "")." "; diff --git a/src/admin/member_toadmin.php b/src/admin/member_toadmin.php index 0adef55a..13fcf5ed 100644 --- a/src/admin/member_toadmin.php +++ b/src/admin/member_toadmin.php @@ -73,7 +73,7 @@ if ($dopost == "toadmin") { $row = $dsql->GetOne("SELECT * FROM `#@__admintype` WHERE `rank`='$usertype'"); $floginid = $cuserLogin->getUserName(); $fromid = $cuserLogin->getUserID(); - $subject = "恭喜您已经成功提升为管理员"; + $subject = "恭喜您已经成功提升管理员"; $message = "亲爱的会员{$userid}，您已经成功提升为{$row['typename']}，具体操作权限请同网站超级管理员联系"; $sendtime = $writetime = time(); $inquery = "INSERT INTO `#@__member_pms` (`floginid`,`fromid`,`toid`,`tologinid`,`folder`,`subject`,`sendtime`,`writetime`,`hasview`,`isadmin`,`message`) VALUES ('$floginid','$fromid','$id','$userid','inbox','$subject','$sendtime','$writetime','0','0','$message'); "; diff --git a/src/admin/search_keywords_main.php b/src/admin/search_keywords_main.php index 1858814e..b3fa60b2 100644 --- a/src/admin/search_keywords_main.php +++ b/src/admin/search_keywords_main.php @@ -65,14 +65,14 @@ function GetKeywordList($dsql, $pageno, $pagesize, $orderby = 'aid') 搜索关键词维护 - 选择 - id - 关键词 - 分词结果 - 频率 - 结果 - 最后搜索时间 - 操作 + 选择 + id + 关键词 + 分词结果 + 频率 + 结果 + 搜索时间 + 操作 "; echo $printhead; if ($orderby == 'result') $orderby = $orderby." ASC"; @@ -81,17 +81,17 @@ function GetKeywordList($dsql, $pageno, $pagesize, $orderby = 'aid') $dsql->Execute(); while ($row = $dsql->GetArray()) { $line = " - - {$row['aid']} - - - - {$row['result']} - ".MyDate("Y-m-d H:i:s", $row['lasttime'])." - - 更新 - 删除 - + + {$row['aid']} + + + + {$row['result']} + ".MyDate("Y-m-d H:i:s", $row['lasttime'])." + + 更新 + 删除 + "; echo $line; } @@ -99,7 +99,7 @@ function GetKeywordList($dsql, $pageno, $pagesize, $orderby = 'aid') 反选 取消 - 删除 + 删除 "; echo ""; diff --git a/src/admin/templets/catalog_main.htm b/src/admin/templets/catalog_main.htm index 9518ffff..148f0403 100644 --- a/src/admin/templets/catalog_main.htm +++ b/src/admin/templets/catalog_main.htm @@ -34,8 +34,8 @@ - diff --git a/src/admin/templets/member_toadmin.htm b/src/admin/templets/member_toadmin.htm index d565e793..48d50b10 100644 --- a/src/admin/templets/member_toadmin.htm +++ b/src/admin/templets/member_toadmin.htm @@ -3,7 +3,7 @@ - 提升为管理员 + 提升管理员 @@ -28,7 +28,7 @@
- + - + - + @@ -91,9 +91,9 @@ {/dede:datalist} diff --git a/src/admin/templets/content_s_list.htm b/src/admin/templets/content_s_list.htm index ceb16305..7e8352d9 100644 --- a/src/admin/templets/content_s_list.htm +++ b/src/admin/templets/content_s_list.htm @@ -3,7 +3,7 @@ - 专题文档管理 + 专题管理 @@ -37,15 +37,15 @@
+ - - + - + @@ -79,19 +79,19 @@ - - +
网站栏目管理 @@ -65,7 +65,7 @@
+ diff --git a/src/admin/templets/content_i_list.htm b/src/admin/templets/content_i_list.htm index 6e0c8b8e..fe2f1b99 100644 --- a/src/admin/templets/content_i_list.htm +++ b/src/admin/templets/content_i_list.htm @@ -63,9 +63,9 @@
选择 id文档属性文档标题 时间栏目栏目 点击 网页 权限
{dede:field.id/} + {dede:field.title/}{dede:field.flag function='IsCommendArchives(@me)'/} {dede:field.senddate function='GetDateTimeMk(@me)'/}{dede:field.typeid function='GetTypename(@me)'/}{dede:field.typeid function='GetTypename(@me)'/} {dede:field.click/} {dede:field.ismake function='IsHtmlArchives(@me)'/} {dede:field.arcrank function='GetRankName(@me)'/} {dede:field.mid function=GetMemberName(@me)/} - - + 属性 + 修改
diff --git a/src/admin/templets/content_list.htm b/src/admin/templets/content_list.htm index d41a1eb3..4488c03c 100644 --- a/src/admin/templets/content_list.htm +++ b/src/admin/templets/content_list.htm @@ -70,9 +70,9 @@
选择 id文档标题文档标题 更新时间栏目栏目 点击 网页 权限{dede:field.arcrank function="GetRankName(@me)"/} {dede:field.mid function=GetMemberName(@me)/} - - - + 属性 + 修改 + 预览
- + - + - + diff --git a/src/admin/templets/content_select_list.htm b/src/admin/templets/content_select_list.htm index 3ee20e21..04487b64 100644 --- a/src/admin/templets/content_select_list.htm +++ b/src/admin/templets/content_select_list.htm @@ -71,9 +71,9 @@ - + - + @@ -96,7 +96,7 @@ diff --git a/src/admin/templets/content_sg_list.htm b/src/admin/templets/content_sg_list.htm index 5f02711f..41492803 100644 --- a/src/admin/templets/content_sg_list.htm +++ b/src/admin/templets/content_sg_list.htm @@ -53,9 +53,9 @@ - + - + @@ -72,8 +72,8 @@ {/dede:datalist} @@ -87,7 +87,7 @@ 移动删除 - 把选定值加到列表 + 选定值加到列表 diff --git a/src/admin/templets/diy_main.htm b/src/admin/templets/diy_main.htm index f2657958..2c8f9e95 100644 --- a/src/admin/templets/diy_main.htm +++ b/src/admin/templets/diy_main.htm @@ -26,9 +26,9 @@ diff --git a/src/admin/templets/feedback_main.htm b/src/admin/templets/feedback_main.htm index 8f798a99..d6b11375 100644 --- a/src/admin/templets/feedback_main.htm +++ b/src/admin/templets/feedback_main.htm @@ -123,7 +123,7 @@
文档列表专题列表
选择 id文档标题文档标题 更新时间栏目栏目 点击 网页 权限
选择 id文档标题文档标题 更新时间栏目栏目 点击 网页 权限 全选 取消 - 把选定值加到列表 + 选定值加到列表
选择 id文档标题文档标题 更新时间栏目栏目 点击 权限 发布人{dede:field.click/} {dede:field.mid function=GetMemberName(@me)/} - - + 修改 + 预览
{dede:field.name/} {dede:field.table/} - 修改 - 导出 - 预览 + 修改 + 导出 + 预览 删除
- + @@ -147,10 +147,10 @@ - {/dede:datalist} diff --git a/src/admin/templets/file_manage_main.htm b/src/admin/templets/file_manage_main.htm index e120e4b6..82e4f686 100644 --- a/src/admin/templets/file_manage_main.htm +++ b/src/admin/templets/file_manage_main.htm @@ -11,9 +11,9 @@
评论管理评论列表
选择{dede:field.ip/} {dede:field.dtime function="GetDateTimeMK(@me)"/} {dede:field.ischeck function="IsCheck(@me)"/} - 修改 - 更新 - 浏览 + + 修改 + 更新 + 浏览
- - - + + + $file - "; @@ -71,10 +71,10 @@ $line = "\n - - + "; @@ -85,10 +85,10 @@ $line = "\n - - + "; @@ -99,10 +99,10 @@ $line = "\n - - + "; @@ -113,10 +113,10 @@ $line = "\n - - + "; @@ -127,10 +127,10 @@ $line = "\n - - + "; @@ -141,10 +141,10 @@ $line = "\n - - + "; @@ -155,10 +155,10 @@ $line = "\n - - + "; @@ -169,10 +169,10 @@ $line = "\n - - + "; @@ -184,11 +184,11 @@ $line = "\n - - + "; @@ -200,11 +200,11 @@ $line = "\n - - + "; @@ -216,11 +216,11 @@ $line = "\n - - + "; @@ -232,11 +232,11 @@ $line = "\n - - + "; @@ -248,11 +248,11 @@ $line = "\n - - + "; @@ -261,10 +261,10 @@ $line = "\n - - + "; diff --git a/src/admin/templets/friendlink_main.htm b/src/admin/templets/friendlink_main.htm index ca28f7a2..ddc225a8 100644 --- a/src/admin/templets/friendlink_main.htm +++ b/src/admin/templets/friendlink_main.htm @@ -87,8 +87,8 @@ {/dede:datalist} diff --git a/src/admin/templets/index.htm b/src/admin/templets/index.htm index a20d550e..edbf1050 100644 --- a/src/admin/templets/index.htm +++ b/src/admin/templets/index.htm @@ -34,8 +34,9 @@ getUserType() >= 10) {?>
    • -
    • +
    • +
    • ':'';?> @@ -75,7 +76,7 @@ $(this).html(''); } }); - } + }; \ No newline at end of file diff --git a/src/admin/templets/log_list.htm b/src/admin/templets/log_list.htm index 7f5fbcad..627bf6e1 100644 --- a/src/admin/templets/log_list.htm +++ b/src/admin/templets/log_list.htm @@ -95,7 +95,7 @@ diff --git a/src/admin/templets/makehtml_all.htm b/src/admin/templets/makehtml_all.htm index d1ffc17f..0f3e4b2e 100644 --- a/src/admin/templets/makehtml_all.htm +++ b/src/admin/templets/makehtml_all.htm @@ -84,7 +84,10 @@ - + diff --git a/src/admin/templets/makehtml_archives.htm b/src/admin/templets/makehtml_archives.htm index ae3ab6e6..4d06f0e9 100644 --- a/src/admin/templets/makehtml_archives.htm +++ b/src/admin/templets/makehtml_archives.htm @@ -46,7 +46,7 @@ diff --git a/src/admin/templets/makehtml_homepage.htm b/src/admin/templets/makehtml_homepage.htm index 1646e190..47f6486c 100644 --- a/src/admin/templets/makehtml_homepage.htm +++ b/src/admin/templets/makehtml_homepage.htm @@ -29,7 +29,7 @@ @@ -64,7 +64,7 @@ if ($data->code == -1){ ?> - + - + - + - + diff --git a/src/admin/templets/makehtml_list.htm b/src/admin/templets/makehtml_list.htm index e90ed4f6..cfefd226 100644 --- a/src/admin/templets/makehtml_list.htm +++ b/src/admin/templets/makehtml_list.htm @@ -40,7 +40,10 @@ - + diff --git a/src/admin/templets/makehtml_spec.htm b/src/admin/templets/makehtml_spec.htm index 5aaa9112..f5785b5d 100644 --- a/src/admin/templets/makehtml_spec.htm +++ b/src/admin/templets/makehtml_spec.htm @@ -21,7 +21,10 @@ - + diff --git a/src/admin/templets/makehtml_taglist.htm b/src/admin/templets/makehtml_taglist.htm index 9fc6b0cc..40d3421c 100644 --- a/src/admin/templets/makehtml_taglist.htm +++ b/src/admin/templets/makehtml_taglist.htm @@ -52,7 +52,10 @@ - + diff --git a/src/admin/templets/media_main.htm b/src/admin/templets/media_main.htm index 05ada138..0c87034e 100644 --- a/src/admin/templets/media_main.htm +++ b/src/admin/templets/media_main.htm @@ -95,7 +95,7 @@ diff --git a/src/admin/templets/member_main.htm b/src/admin/templets/member_main.htm index 81654f12..7ae7bfa4 100644 --- a/src/admin/templets/member_main.htm +++ b/src/admin/templets/member_main.htm @@ -58,7 +58,7 @@
    文件名称文件大小修改时间文件名称文件大小修改时间 操作
    - 改名 + + 改名 删除
    $file $filesize KB$filetime - 改名 - 移动 + $filetime + 改名 + 移动 删除
    $file $filesize KB$filetime - 改名 - 移动 + $filetime + 改名 + 移动 删除
    $file $filesize KB$filetime - 改名 - 移动 + $filetime + 改名 + 移动 删除
    $file $filesize KB$filetime - 改名 - 移动 + $filetime + 改名 + 移动 删除
    $file $filesize KB$filetime - 改名 - 移动 + $filetime + 改名 + 移动 删除
    $file $filesize KB$filetime - 改名 - 移动 + $filetime + 改名 + 移动 删除
    $file $filesize KB$filetime - 改名 - 移动 + $filetime + 改名 + 移动 删除
    $file $filesize KB$filetime - 改名 - 移动 + $filetime + 改名 + 移动 删除
    $file $filesize KB$filetime - 修改 - 改名 - 移动 + $filetime + 修改 + 改名 + 移动 删除
    $file $filesize KB$filetime - 修改 - 改名 - 移动 + $filetime + 修改 + 改名 + 移动 删除
    $file $filesize KB$filetime - 修改 - 改名 - 移动 + $filetime + 修改 + 改名 + 移动 删除
    $file $filesize KB$filetime - 修改 - 改名 - 移动 + $filetime + 修改 + 改名 + 移动 删除
    $file $filesize KB$filetime - 修改 - 改名 - 移动 + $filetime + 修改 + 改名 + 移动 删除
    $file $filesize KB$filetime - 改名 - 移动 + $filetime + 改名 + 移动 删除
    {dede:field.ischeck function="GetSta(@me)"/} {dede:field.sortrank/} - 修改 - 删除 + 修改 + 删除
    - +
    + + +
    - +
    -
    默认的情况下，生成的首页文件放在根目录，如果您的不是根目录安装的网站，又想把首页创建到网站根目录，那么用相对路径来表示“首页位置”，例：安装在http://www.abc.com/DedeBIZ/目录，生成的首页为http://www.abc.com/index.html，首页就应填写：“../index.html”
    +
    默认首页更新文件存放在根目录，如果您不是根目录安装的网站，想把首页更新到网站根目录，用相对路径来表示“首页位置”，例：安装在http://www.abc.com/DedeBIZ/目录，生成的首页为http://www.abc.com/index.html，应该填写：“../index.html”
    尚未开启DedeBIZ商业组件 如何启动组件启动商业组件失败，如何启动组件
    设置操作密码：设置密码： 设定后所有的DedeBIZ涉及安全操作输入当前操作密码
    重复操作密码：重复密码：
    尚未开启DedeBIZ商业组件 如何启动组件启动商业组件失败，如何启动组件
    - +
    + + +
    + + +
    个文件
    + + +
    {dede:field.uptime function="MyDate('Y-m-d H:i',@me)"/} {dede:field.mediatype function="MediaType(@me,$fields['url'])"/} - 修改 + 修改 删除
    - + @@ -66,50 +66,59 @@ - - + - {dede:datalist empty=''} + {dede:datalist empty=''} - + - - + + - {/dede:datalist} - - +
    所有会员列表所有会员列表
    选择用户 名称 邮箱性别 会员等级 会员属性 地址时间发布限制发布限制 操作
    暂无文档
    暂无文档
    {dede:field.mid/} + ";}; echo ''.$fields['userid'].''; if ($fields['spacesta']==-2) echo " 禁言"; if ($fields['spacesta']==-1) echo " 未审核"; ?> - {dede:field.matt function="GetMAtt(@me)"/} + + {dede:field.sex/} + {dede:field.matt function="GetMAtt(@me)"/} {dede:field.uname/} {dede:field.email/}{dede:field.sex/}{dede:field.rank function="GetMemberName(@me,'限制会员')"/}{dede:field.mtype/}用户丨金币{dede:field.money/}丨积分{dede:field.scores/}{dede:field.loginip/}丨{dede:field.logintime function="MyDate('y-m-d H:i',@me)"/} + {dede:field.mtype/}用户 + 金币{dede:field.money/} + 积分{dede:field.scores/} + + {dede:field.loginip/} + {dede:field.logintime function="MyDate('y-m-d H:i',@me)"/} + {dede:field.send_max/} - 修改 - 删除 - 文档 - 提升 + + 修改 + 文档 + 提升 + 删除
    + 全选 取消 删除
    {dede:pagelist listsize='6'/}{dede:pagelist listsize='6'/}
    diff --git a/src/admin/templets/member_operations.htm b/src/admin/templets/member_operations.htm index 9648b31b..76605714 100644 --- a/src/admin/templets/member_operations.htm +++ b/src/admin/templets/member_operations.htm @@ -100,9 +100,9 @@
    - +
    - + ';} else {?> diff --git a/src/admin/templets/member_view.htm b/src/admin/templets/member_view.htm index 1987f3b1..3867154d 100644 --- a/src/admin/templets/member_view.htm +++ b/src/admin/templets/member_view.htm @@ -52,11 +52,17 @@ - + - + diff --git a/src/admin/templets/module_main.htm b/src/admin/templets/module_main.htm index bffb1950..668bcda5 100644 --- a/src/admin/templets/module_main.htm +++ b/src/admin/templets/module_main.htm @@ -81,9 +81,9 @@ diff --git a/src/admin/templets/mychannel_main.htm b/src/admin/templets/mychannel_main.htm index 864d1463..b7c3d5bf 100644 --- a/src/admin/templets/mychannel_main.htm +++ b/src/admin/templets/mychannel_main.htm @@ -27,11 +27,11 @@ - - - + + + - + {dede:datalist empty=''} @@ -43,12 +43,12 @@ {/dede:datalist} diff --git a/src/admin/templets/mytag_main.htm b/src/admin/templets/mytag_main.htm index 5b25fdf3..714db92d 100644 --- a/src/admin/templets/mytag_main.htm +++ b/src/admin/templets/mytag_main.htm @@ -30,9 +30,9 @@ {/dede:datalist} diff --git a/src/admin/templets/plus_main.htm b/src/admin/templets/plus_main.htm index 52b5a556..7d084d11 100644 --- a/src/admin/templets/plus_main.htm +++ b/src/admin/templets/plus_main.htm @@ -16,8 +16,8 @@ - - + + {dede:datalist empty=''} diff --git a/src/admin/templets/recycling.htm b/src/admin/templets/recycling.htm index 34191475..34fad777 100644 --- a/src/admin/templets/recycling.htm +++ b/src/admin/templets/recycling.htm @@ -90,8 +90,8 @@ {/dede:datalist} diff --git a/src/admin/templets/stepselect_main.htm b/src/admin/templets/stepselect_main.htm index df98d106..000198dc 100644 --- a/src/admin/templets/stepselect_main.htm +++ b/src/admin/templets/stepselect_main.htm @@ -341,8 +341,8 @@ {/dede:datalist} diff --git a/src/admin/templets/sys_admin_user.htm b/src/admin/templets/sys_admin_user.htm index de764b27..2fd96770 100644 --- a/src/admin/templets/sys_admin_user.htm +++ b/src/admin/templets/sys_admin_user.htm @@ -43,12 +43,15 @@ - + {/dede:datalist} diff --git a/src/admin/templets/sys_cache_up.htm b/src/admin/templets/sys_cache_up.htm index 30c7c2a0..2018108c 100644 --- a/src/admin/templets/sys_cache_up.htm +++ b/src/admin/templets/sys_cache_up.htm @@ -24,7 +24,10 @@ - + diff --git a/src/admin/templets/sys_data.htm b/src/admin/templets/sys_data.htm index f2c66183..a66d5489 100644 --- a/src/admin/templets/sys_data.htm +++ b/src/admin/templets/sys_data.htm @@ -81,7 +81,7 @@
    会员管理 > 提升为管理员会员管理 > 提升管理员
    您已经是管理员，不要提升了
    注册时间：丨 + + +
    最近登录时间：丨 + + +
    用户类型：
    id栏目名称识别id附加表栏目名称识别id附加表 状态模型模型 操作
    暂无文档
    {dede:field.isshow function="GetSta(@me,$fields['id'])"/} {dede:field.issystem function='IsSystem(@me)'/} - - - - - - + + + + + +
    {dede:field.timeset function='TimeSetValue(@me)'/} {dede:field.endtime function='GetDateMk(@me)'/} - 修改 - js调用 - 删除 + 修改 + js调用 + 删除
    id插件名称插件作者插件名称插件作者 操作
    暂无文档
    {dede:field.typename/} {dede:field.click/} - 还原 - 删除 + 还原 + 删除
    {dede:field.issystem function="@me==1 ? '是' : '否'"/} {dede:field.egroup/} - 更新 - 查看 + 更新 + 查看
    {dede:field.userid/} {dede:field.uname/} {dede:field.usertype function="GetUserType(@me)"/}{dede:field.loginip/}丨{dede:field.logintime function="GetDateTimeMk(@me)"/} + {dede:field.loginip/} + {dede:field.logintime function="GetDateTimeMk(@me)"/} + {dede:field.typename function="GetChannel(@me)"/} - 修改 - 删除 - 文档　 + 修改 + 文档 + 删除
    + + +
    数据备份还原 数据还原 - SQL命令行工具 + SQL命令工具
    @@ -112,9 +112,9 @@ - 优化 - 修复 - 结构 + 优化 + 修复 + 结构 - 优化 - 修复 - 结构 + 优化 + 修复 + 结构 - 优化 - 修复 - 结构 + 优化 + 修复 + 结构 - 优化 - 修复 - 结构 + 优化 + 修复 + 结构 数据还原 数据备份 - SQL命令行工具 + SQL命令工具 diff --git a/src/admin/templets/sys_safetest.htm b/src/admin/templets/sys_safetest.htm index 5cd8de71..44c0c2e9 100644 --- a/src/admin/templets/sys_safetest.htm +++ b/src/admin/templets/sys_safetest.htm @@ -65,7 +65,7 @@ - + diff --git a/src/admin/templets/sys_sql_query.htm b/src/admin/templets/sys_sql_query.htm index 74993c6f..c8bfd9a2 100644 --- a/src/admin/templets/sys_sql_query.htm +++ b/src/admin/templets/sys_sql_query.htm @@ -3,7 +3,7 @@ - SQL命令行工具 + SQL命令工具 @@ -17,7 +17,7 @@ - + {/dede:datalist} diff --git a/src/admin/templets/templets_default.htm b/src/admin/templets/templets_default.htm index cdace585..47a814ab 100644 --- a/src/admin/templets/templets_default.htm +++ b/src/admin/templets/templets_default.htm @@ -3,7 +3,7 @@ - 模板管理器 + 默认模板管理 @@ -25,14 +25,14 @@ - - - + + + - - + + - - + {/dede:datalist} diff --git a/src/admin/templets/templets_tagsource.htm b/src/admin/templets/templets_tagsource.htm index cc6afd35..81fa15b5 100644 --- a/src/admin/templets/templets_tagsource.htm +++ b/src/admin/templets/templets_tagsource.htm @@ -14,9 +14,9 @@ - - - + + + @@ -33,11 +33,11 @@ $filetime = MyDate("Y-m-d H:i",$filetime); $fileinfo = GetHelpInfo(str_replace('.lib.php','',$filename)); ?> - - + + - - + + diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css index 9a73728e..13dceffc 100644 --- a/src/static/web/css/admin.css +++ b/src/static/web/css/admin.css @@ -497,6 +497,14 @@ span.page-link { color:#fff; background:#1eb867 } +.maintable { + width:98%; + border:1px solid #dee2e6 +} +.form-control { + display:inline-block; + margin-right:10px +} .table { margin-bottom:0; color:#545b62 @@ -505,13 +513,17 @@ span.page-link { padding:.65rem; vertical-align:middle } -.maintable { - width:98%; - border:1px solid #dee2e6 +.fa { + font-size:14px!important; + color:inherit } -.form-control { - display:inline-block; - margin-right:10px +.btn-xs { + padding:2px; + line-height:12px; + font-size:12px +} +.btn+.btn,.btn-text+.btn-text { + margin-left:1rem } .admin-win { background:#f5f5f5; @@ -578,18 +590,6 @@ span.page-link { height:20px; border-radius:.2rem } -.fa { - font-size:14px!important; - color:inherit -} -.btn-xs { - padding:2px; - line-height:12px; - font-size:12px -} -.btn+.btn,.btn-text+.btn-text { - margin-left:1rem -} #browsehappy { padding:20px 30px; font-size:14px; diff --git a/src/static/web/css/style.css b/src/static/web/css/style.css index c4ebd9d1..6240ee9d 100644 --- a/src/static/web/css/style.css +++ b/src/static/web/css/style.css @@ -289,9 +289,40 @@ form.search { .logo img { height:40px } +.table { + color:#545b62 +} +.form-control { + height:36px; + line-height:36px +} +.form-control,.btn,.fa { + font-size:14px!important +} +.btn+.btn,.btn-text+.btn-text { + margin-left:1rem +} +.rounded-md { + border-radius:30px!important +} +.login-from { + margin:6rem 0 +} +.login-box { + padding:1.25rem; + width:500px; + background:#fff +} +#validateimg { + border-radius:0 .2rem .2rem 0 +} .user-login { line-height:40px } +.user-actions { + line-height:40px; + text-align:right +} .user-admin img { margin-right:10px; width:30px; @@ -299,17 +330,48 @@ form.search { border-radius:50%; border-bottom:1px solid #eee } -.table { - color:#545b62 +.user-logo { + max-width:60px; + min-height:60px; + border-radius:50%; + border-bottom:1px solid #eee } -.form-control,.btn,.fa { - font-size:14px!important +.user-img { + margin-right:10px; + width:30px; + height:30px; + border-radius:50%; + border:1px solid #dee2e6 } -.btn+.btn,.btn-text+.btn-text { - margin-left:1rem +.user-meter i { + font-size:24px!important } -.rounded-md { - border-radius:30px!important +.list-group-item.active a { + color:#fff +} +.list-group-flush>.list-group-item { + cursor:pointer +} +.nav-link.active { + color:#ec982c +} +.dropdown { + display:inline-block; + margin-left:.25rem; + content:""; + border-top:.3em solid; + border-right:.3em solid transparent; + border-bottom:0; + border-left:.3em solid transparent; + vertical-align:.25rem +} +.pannel-main-container { + padding:1.5rem; + background:#fff +} +.thumbnail-md { + max-width:200px; + max-height:120px } #btnScrollTop { display:none; @@ -338,4 +400,7 @@ form.search { .spec .card img { height:130px } +.login-from,.login-box { + width:100% +} } \ No newline at end of file diff --git a/src/static/web/css/user.css b/src/static/web/css/user.css deleted file mode 100644 index 9137856a..00000000 --- a/src/static/web/css/user.css +++ /dev/null @@ -1,67 +0,0 @@ -.login-from { - margin:6rem 0 -} -.login-box { - padding:1.25rem; - width:500px; - background:#fff -} -#validateimg { - border-radius:0 .2rem .2rem 0 -} -.user-actions { - line-height:40px; - text-align:right -} -.user-logo { - max-width:60px; - min-height:60px; - border-radius:50%; - border-bottom:1px solid #eee -} -.user-img { - margin-right:10px; - width:30px; - height:30px; - border-radius:50%; - border:1px solid #dee2e6 -} -.user-meter i { - font-size:24px!important -} -.list-group-item.active a { - color:#fff -} -.list-group-flush>.list-group-item { - cursor:pointer -} -.nav-link.active { - color:#ec982c -} -.dropdown { - display:inline-block; - margin-left:.25rem; - content:""; - border-top:.3em solid; - border-right:.3em solid transparent; - border-bottom:0; - border-left:.3em solid transparent; - vertical-align:.25rem -} -.pannel-main-container { - padding:1.5rem; - background:#fff -} -.thumbnail-md { - max-width:200px; - max-height:120px -} -.form-control { - height:36px; - line-height:36px -} -@media (max-width:480px) { - .login-from,.login-box { - width:100% -} -} \ No newline at end of file diff --git a/src/system/typelink/typeunit.class.admin.php b/src/system/typelink/typeunit.class.admin.php index 3e7accfe..981cf56c 100755 --- a/src/system/typelink/typeunit.class.admin.php +++ b/src/system/typelink/typeunit.class.admin.php @@ -112,37 +112,37 @@ class TypeUnit echo ""; echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo "
    SQL命令行工具SQL命令工具 数据备份 数据还原 diff --git a/src/admin/templets/tags_main.htm b/src/admin/templets/tags_main.htm index 1e8d424b..6da56183 100644 --- a/src/admin/templets/tags_main.htm +++ b/src/admin/templets/tags_main.htm @@ -116,10 +116,10 @@ - ,"");' class="btn btn-success btn-sm">设置 - 更新 - 生成 - 删除 + ,"");' class="btn btn-light btn-sm"> 设置 + 更新 + 生成 + 删除
    模板名模板描述修改时间模板名模板描述修改时间 操作
    - 修改 + + 修改 删除 diff --git a/src/admin/templets/templets_one.htm b/src/admin/templets/templets_one.htm index 0b7d1ccb..cec32177 100644 --- a/src/admin/templets/templets_one.htm +++ b/src/admin/templets/templets_one.htm @@ -61,9 +61,9 @@ {dede:field.likeid/} {dede:field.uptime function='GetDateMk(@me)'/} - 修改 - 预览 - 删除 + 修改 + 预览 + 删除
    标签源码管理
    标签文件名标签说明修改时间标签文件名标签说明修改时间 操作
    修改 修改
    列表{$nss}".$typeName."[id：".$id."]（文档数：".$this->GetTotalArc($id)."）"; echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo "
    "; } //带封面的栏目 else if ($ispart == 1) { echo ""; echo "
    封面{$nss}".$typeName."[id：".$id."]"; echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo "
    "; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; } //独立页面 else if ($ispart == 2) { echo ""; echo "
    外部{$nss}".$typeName."[id：".$id."]"; echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo "
    "; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; } echo ""; $lastid = GetCookie('lastCid'); @@ -195,13 +195,13 @@ class TypeUnit echo "
    "; echo "$step列表{$nss}".$typeName."[id：".$id."]（文档数：".$this->GetTotalArc($id)."）"; echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo "
    "; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; } //封面栏目 else if ($ispart == 1) { @@ -209,13 +209,13 @@ class TypeUnit echo "
    "; echo "$step封面{$nss}".$typeName."[id：".$id."]"; echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo "
    "; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; } //独立页面 else if ($ispart == 2) { @@ -223,11 +223,11 @@ class TypeUnit echo "
    "; echo "$step外部{$nss}".$typeName."[id：".$id."]"; echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo "
    "; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; } echo ""; $this->LogicListAllSunType($id, $step."　"); diff --git a/src/theme/dedebiz/index.htm b/src/theme/dedebiz/index.htm index e536e86b..a5eb9d20 100644 --- a/src/theme/dedebiz/index.htm +++ b/src/theme/dedebiz/index.htm @@ -3,7 +3,7 @@ - {dede:global.cfg_webname/} + {dede:global.cfg_indexseo/}-{dede:global.cfg_webname/} diff --git a/src/theme/dedebiz/widget_article_feedback.htm b/src/theme/dedebiz/widget_article_feedback.htm index f73572b3..ea011827 100644 --- a/src/theme/dedebiz/widget_article_feedback.htm +++ b/src/theme/dedebiz/widget_article_feedback.htm @@ -3,7 +3,7 @@

    发表评论

    -
    +
    diff --git a/src/theme/plus/recommend.htm b/src/theme/plus/recommend.htm index cb7fb417..47216fdb 100644 --- a/src/theme/plus/recommend.htm +++ b/src/theme/plus/recommend.htm @@ -21,14 +21,12 @@
    - + diff --git a/src/user/templets/album_add.htm b/src/user/templets/album_add.htm index a0f9a062..75d3a42c 100755 --- a/src/user/templets/album_add.htm +++ b/src/user/templets/album_add.htm @@ -8,7 +8,6 @@ - diff --git a/src/user/templets/album_edit.htm b/src/user/templets/album_edit.htm index ee106ca0..1374578a 100755 --- a/src/user/templets/album_edit.htm +++ b/src/user/templets/album_edit.htm @@ -8,7 +8,6 @@ - diff --git a/src/user/templets/archives_add.htm b/src/user/templets/archives_add.htm index d29e3849..a3d08c26 100755 --- a/src/user/templets/archives_add.htm +++ b/src/user/templets/archives_add.htm @@ -8,7 +8,6 @@ - diff --git a/src/user/templets/archives_edit.htm b/src/user/templets/archives_edit.htm index 5a88e193..20e79c84 100755 --- a/src/user/templets/archives_edit.htm +++ b/src/user/templets/archives_edit.htm @@ -8,7 +8,6 @@ - diff --git a/src/user/templets/archives_sg_add.htm b/src/user/templets/archives_sg_add.htm index f323cf83..dd185a1a 100755 --- a/src/user/templets/archives_sg_add.htm +++ b/src/user/templets/archives_sg_add.htm @@ -8,7 +8,6 @@ - diff --git a/src/user/templets/archives_sg_edit.htm b/src/user/templets/archives_sg_edit.htm index 995daca9..0ea51e78 100755 --- a/src/user/templets/archives_sg_edit.htm +++ b/src/user/templets/archives_sg_edit.htm @@ -8,7 +8,6 @@ - diff --git a/src/user/templets/article_add.htm b/src/user/templets/article_add.htm index f612c6a8..7e7066b8 100755 --- a/src/user/templets/article_add.htm +++ b/src/user/templets/article_add.htm @@ -8,7 +8,6 @@ - diff --git a/src/user/templets/article_edit.htm b/src/user/templets/article_edit.htm index e8d1a08c..f877ecec 100755 --- a/src/user/templets/article_edit.htm +++ b/src/user/templets/article_edit.htm @@ -8,7 +8,6 @@ - diff --git a/src/user/templets/buy.htm b/src/user/templets/buy.htm index 662f1597..874afbca 100755 --- a/src/user/templets/buy.htm +++ b/src/user/templets/buy.htm @@ -8,7 +8,6 @@ - diff --git a/src/user/templets/buy_action_payment.htm b/src/user/templets/buy_action_payment.htm index 07b65eb3..a58f25a9 100755 --- a/src/user/templets/buy_action_payment.htm +++ b/src/user/templets/buy_action_payment.htm @@ -8,7 +8,6 @@ - diff --git a/src/user/templets/content_list.htm b/src/user/templets/content_list.htm index 09973ab9..98576008 100755 --- a/src/user/templets/content_list.htm +++ b/src/user/templets/content_list.htm @@ -8,7 +8,6 @@ - diff --git a/src/user/templets/mypay.htm b/src/user/templets/mypay.htm index 078f4742..7836fc07 100755 --- a/src/user/templets/mypay.htm +++ b/src/user/templets/mypay.htm @@ -8,7 +8,6 @@ - diff --git a/src/user/templets/mystow.htm b/src/user/templets/mystow.htm index 07a860dc..ad0dc96f 100755 --- a/src/user/templets/mystow.htm +++ b/src/user/templets/mystow.htm @@ -8,7 +8,6 @@ - diff --git a/src/user/templets/operation.htm b/src/user/templets/operation.htm index 5315711b..67f787c8 100755 --- a/src/user/templets/operation.htm +++ b/src/user/templets/operation.htm @@ -8,7 +8,6 @@ - diff --git a/src/user/templets/pm-main.htm b/src/user/templets/pm-main.htm index 4ba09b93..7e8995eb 100755 --- a/src/user/templets/pm-main.htm +++ b/src/user/templets/pm-main.htm @@ -8,7 +8,6 @@ -
    您好友的邮箱：
    您的留言： - +