From 50415b9f6cb2bd7bc2d2ca38324ca5b509688b0f Mon Sep 17 00:00:00 2001 From: zhaixiaojian Date: Sat, 16 Nov 2024 14:12:08 +0800 Subject: [PATCH] * [task#132436,doing,2h,1h] Adjust backup button. --- module/instance/js/autobackup.ui.js | 16 -------- module/instance/lang/de.php | 4 +- module/instance/lang/en.php | 4 +- module/instance/lang/fr.php | 4 +- module/instance/lang/zh-cn.php | 8 +++- module/instance/ui/autobackup.html.php | 56 -------------------------- 6 files changed, 12 insertions(+), 80 deletions(-) delete mode 100644 module/instance/js/autobackup.ui.js delete mode 100644 module/instance/ui/autobackup.html.php diff --git a/module/instance/js/autobackup.ui.js b/module/instance/js/autobackup.ui.js deleted file mode 100644 index e0abb87fda..0000000000 --- a/module/instance/js/autobackup.ui.js +++ /dev/null @@ -1,16 +0,0 @@ -$(function() -{ - $("input[type=checkbox][name='autoBackup']").on('change', function(event) - { - var enabled = $("input[type=checkbox][name='autoBackup']:checked").length > 0; - if(enabled) - { - $('.backup-settings').show(); - } - else - { - $('.backup-settings').hide(); - } - }); - $("input[type=checkbox][name='autoBackup']").trigger("change"); -}); \ No newline at end of file diff --git a/module/instance/lang/de.php b/module/instance/lang/de.php index 8acb9e337e..ebd34a6ae0 100644 --- a/module/instance/lang/de.php +++ b/module/instance/lang/de.php @@ -139,7 +139,7 @@ $lang->instance->backup->cycleList[1] = 'Daily'; $lang->instance->backup->operators = array(); $lang->instance->backup->operators['auto'] = 'Automatic backup'; $lang->instance->backup->operators['manual'] = 'Manual backup'; -$lang->instance->backup->operators['settings'] = 'Settings'; +$lang->instance->backup->operators['settings'] = 'Backup Settings'; $lang->instance->backup->statusList = array(); $lang->instance->backup->statusList['success'] = 'successful'; @@ -158,7 +158,7 @@ $lang->instance->backup->statusList['downloadFailed'] = 'Download failed'; $lang->instance->restore = new stdclass; $lang->instance->restore->common = 'Restore'; $lang->instance->restore->autoRestore = 'Auto Restore'; -$lang->instance->restore->enableAutoRestore = 'Do you want to enable automatic backup'; +$lang->instance->restore->enableAutoRestore = 'Automatic backup'; $lang->instance->restore->cycleDays = 'Backup cycle'; $lang->instance->restore->restoreTime = 'Backup Time'; $lang->instance->restore->invalidTime = 'Invalid time'; diff --git a/module/instance/lang/en.php b/module/instance/lang/en.php index 8acb9e337e..ebd34a6ae0 100644 --- a/module/instance/lang/en.php +++ b/module/instance/lang/en.php @@ -139,7 +139,7 @@ $lang->instance->backup->cycleList[1] = 'Daily'; $lang->instance->backup->operators = array(); $lang->instance->backup->operators['auto'] = 'Automatic backup'; $lang->instance->backup->operators['manual'] = 'Manual backup'; -$lang->instance->backup->operators['settings'] = 'Settings'; +$lang->instance->backup->operators['settings'] = 'Backup Settings'; $lang->instance->backup->statusList = array(); $lang->instance->backup->statusList['success'] = 'successful'; @@ -158,7 +158,7 @@ $lang->instance->backup->statusList['downloadFailed'] = 'Download failed'; $lang->instance->restore = new stdclass; $lang->instance->restore->common = 'Restore'; $lang->instance->restore->autoRestore = 'Auto Restore'; -$lang->instance->restore->enableAutoRestore = 'Do you want to enable automatic backup'; +$lang->instance->restore->enableAutoRestore = 'Automatic backup'; $lang->instance->restore->cycleDays = 'Backup cycle'; $lang->instance->restore->restoreTime = 'Backup Time'; $lang->instance->restore->invalidTime = 'Invalid time'; diff --git a/module/instance/lang/fr.php b/module/instance/lang/fr.php index 8acb9e337e..ebd34a6ae0 100644 --- a/module/instance/lang/fr.php +++ b/module/instance/lang/fr.php @@ -139,7 +139,7 @@ $lang->instance->backup->cycleList[1] = 'Daily'; $lang->instance->backup->operators = array(); $lang->instance->backup->operators['auto'] = 'Automatic backup'; $lang->instance->backup->operators['manual'] = 'Manual backup'; -$lang->instance->backup->operators['settings'] = 'Settings'; +$lang->instance->backup->operators['settings'] = 'Backup Settings'; $lang->instance->backup->statusList = array(); $lang->instance->backup->statusList['success'] = 'successful'; @@ -158,7 +158,7 @@ $lang->instance->backup->statusList['downloadFailed'] = 'Download failed'; $lang->instance->restore = new stdclass; $lang->instance->restore->common = 'Restore'; $lang->instance->restore->autoRestore = 'Auto Restore'; -$lang->instance->restore->enableAutoRestore = 'Do you want to enable automatic backup'; +$lang->instance->restore->enableAutoRestore = 'Automatic backup'; $lang->instance->restore->cycleDays = 'Backup cycle'; $lang->instance->restore->restoreTime = 'Backup Time'; $lang->instance->restore->invalidTime = 'Invalid time'; diff --git a/module/instance/lang/zh-cn.php b/module/instance/lang/zh-cn.php index 52b29e3be5..e40e9d8865 100644 --- a/module/instance/lang/zh-cn.php +++ b/module/instance/lang/zh-cn.php @@ -139,7 +139,7 @@ $lang->instance->backup->cycleList[1] = '每日'; $lang->instance->backup->operators = array(); $lang->instance->backup->operators['auto'] = '自动备份'; $lang->instance->backup->operators['manual'] = '手动备份'; -$lang->instance->backup->operators['settings'] = '设置'; +$lang->instance->backup->operators['settings'] = '备份设置'; $lang->instance->backup->statusList = array(); $lang->instance->backup->statusList['success'] = '成功'; @@ -155,16 +155,20 @@ $lang->instance->backup->statusList['uploadFailed'] = '上传失败'; $lang->instance->backup->statusList['downloading'] = '下载中'; $lang->instance->backup->statusList['downloadFailed'] = '下载失败'; +$lang->instance->backup->autoRestoreOptions[0] = '关闭'; +$lang->instance->backup->autoRestoreOptions[1] = '开启'; + $lang->instance->restore = new stdclass; $lang->instance->restore->common = '还原'; $lang->instance->restore->autoRestore = '自动备份'; -$lang->instance->restore->enableAutoRestore = '是否开启自动备份'; +$lang->instance->restore->enableAutoRestore = '自动备份'; $lang->instance->restore->cycleDays = '还原周期'; $lang->instance->restore->restoreTime = '还原时间'; $lang->instance->restore->invalidTime = '无效的时间'; $lang->instance->restore->disableAutoRestore = '自动备份已关闭'; $lang->instance->restore->firstStartTime = '%s 首次自动备份将于%s 执行'; + $lang->instance->restore->cycleList[1] = '每日'; $lang->instance->restore->statusList = array(); diff --git a/module/instance/ui/autobackup.html.php b/module/instance/ui/autobackup.html.php deleted file mode 100644 index 2a5ddfee1e..0000000000 --- a/module/instance/ui/autobackup.html.php +++ /dev/null @@ -1,56 +0,0 @@ - - * @package instance - * @link https://www.zentao.net - */ - -namespace zin; - -formPanel -( - set::id('automaticBackupForm'), - set::title($lang->instance->backup->operators['auto']), - set::submitBtnText($lang->save), - set::actions(array('submit')), - formRow - ( - formGroup - ( - set::name('autoBackup'), - set::width('500px'), - set::control(array('control' => 'checkbox', 'value' => '1', 'text' => $lang->instance->restore->enableAutoRestore, 'checked' => $backupSettings->autoBackup ? 'true' : '')), - ) - ), - formRow - ( - formGroup - ( - set::name('backupTime'), - set::width('20px'), - set::required(true), - set::class('backup-settings'), - set::label($lang->instance->backup->backupTime), - set::control(array('control' => 'time')), - set::value($backupSettings->backupTime) - ) - ), - formRow - ( - formGroup - ( - set::name('backupCycle'), - set::width('20px'), - set::required(true), - set::control('picker'), - set::class('backup-settings'), - set::label($lang->instance->backup->cycleDays), - set::items($lang->instance->backup->cycleList), - set::value($backupSettings->cycleDays) - ) - ) -);