From 9f0150d6781d6bb42c6565f0ade3655a71131937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=83=A1?= <3203164629@qq.com> Date: Thu, 31 Aug 2023 18:49:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=87=B3v1.85.3=EF=BC=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=86=85=E5=AE=B9=E5=9C=A8=E7=AC=94=E8=AE=B0?= =?UTF-8?q?=E4=B8=AD=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/appmarket/cp.php | 1 + .../appmarket/template/uninstall_confirm.htm | 4 +- admin/setting/images/setting.css | 9 - admin/setting/template/perm_group.htm | 2 +- core/core_version.php | 4 +- core/template/default/common/about.htm | 8 +- core/template/default/common/header_right.htm | 2 +- dzz/images/folder/folder.css | 6 + dzz/images/newfile/{new.docxf => docxf.docxf} | Bin dzz/images/word/bt_compose2_1x.png | Bin 592 -> 0 bytes dzz/images/word/bt_speed_dial_1x.png | Bin 323 -> 0 bytes dzz/images/word/index.htm | 0 dzz/images/word/loading.svg | 16 - dzz/images/word/word.css | 904 ------------------ dzz/shares/template/list.htm | 2 +- dzz/shares/template/password.htm | 72 +- static/bootstrap/css/bootstrap.min.css | 30 +- static/css/style.min.css | 9 +- 18 files changed, 71 insertions(+), 998 deletions(-) rename dzz/images/newfile/{new.docxf => docxf.docxf} (100%) delete mode 100644 dzz/images/word/bt_compose2_1x.png delete mode 100644 dzz/images/word/bt_speed_dial_1x.png delete mode 100644 dzz/images/word/index.htm delete mode 100644 dzz/images/word/loading.svg delete mode 100644 dzz/images/word/word.css diff --git a/admin/appmarket/cp.php b/admin/appmarket/cp.php index 8fb95a1..58fe033 100644 --- a/admin/appmarket/cp.php +++ b/admin/appmarket/cp.php @@ -12,6 +12,7 @@ if (!defined('IN_DZZ') || !defined('IN_ADMIN')) { require_once libfile('function/admin'); $do = trim($_GET['do']); $op=$_GET['op']; +$navtitle=lang('appname'); if ($do == 'export') {//应用导出 $appid = intval($_GET['appid']); $app = C::t('app_market') -> fetch($appid); diff --git a/admin/appmarket/template/uninstall_confirm.htm b/admin/appmarket/template/uninstall_confirm.htm index 1fb2c15..3cdf74d 100644 --- a/admin/appmarket/template/uninstall_confirm.htm +++ b/admin/appmarket/template/uninstall_confirm.htm @@ -10,10 +10,10 @@

{$app_delete_confirm}

-

+

-     +     diff --git a/admin/setting/images/setting.css b/admin/setting/images/setting.css index 381ea44..31b6212 100644 --- a/admin/setting/images/setting.css +++ b/admin/setting/images/setting.css @@ -40,15 +40,6 @@ ul{ overflow: hidden; } -.label-gainsboro{ - margin-right: 19px; -} -.label-gainsboro{ - font-weight: 300; - border-radius: 2px; - padding: 2px 5px; - border: 1px solid rgba(221, 221, 221, 1); -} .perm-ok{ padding-right: 5px; } diff --git a/admin/setting/template/perm_group.htm b/admin/setting/template/perm_group.htm index dd296c5..8ac0a90 100644 --- a/admin/setting/template/perm_group.htm +++ b/admin/setting/template/perm_group.htm @@ -65,7 +65,7 @@ $v[pername] -

{lang system_default}

+

{lang system_default}

diff --git a/core/core_version.php b/core/core_version.php index c111d96..0464f7c 100644 --- a/core/core_version.php +++ b/core/core_version.php @@ -14,7 +14,7 @@ if(!defined('CORE_VERSION')) { define('CORE_VERSION', '2.02'); define('CORE_RELEASE', '20180909'); define('CORE_FIXBUG' , '20000000'); - define('CORE_XHVERSION', '1.85.2'); - define('CORE_XHRELEASE', '20230830'); + define('CORE_XHVERSION', '1.85.3'); + define('CORE_XHRELEASE', '20230831'); define('CORE_XHFIXBUG' , '20230829'); } \ No newline at end of file diff --git a/core/template/default/common/about.htm b/core/template/default/common/about.htm index 136a5b0..0b1729d 100644 --- a/core/template/default/common/about.htm +++ b/core/template/default/common/about.htm @@ -16,7 +16,7 @@ $appinfo[appname]

- + $about[name_zh] $about[name_en] @@ -27,14 +27,14 @@

- 授权协议: AGPL V3 + 授权协议: AGPL V3 开源协议

- 服务支持: www.dzzoffice.com + 服务支持: www.dzzoffice.com

- 小胡版本:$about[xhversion] + 小胡版本:$about[xhversion]