From d12a6b5aefc5a23bdc6b529c59bbff2ddf543b3d Mon Sep 17 00:00:00 2001 From: zhaoke Date: Wed, 26 Jul 2023 10:07:58 +0800 Subject: [PATCH] * Adjust action desc and add actions of instance. --- module/action/lang/de.php | 8 ++++---- module/action/lang/en.php | 8 ++++---- module/action/lang/fr.php | 8 ++++---- module/action/lang/vi.php | 8 ++++---- module/action/lang/zh-cn.php | 18 +++++++++--------- module/action/lang/zh-tw.php | 18 +++++++++--------- module/instance/config.php | 15 ++++++++------- module/instance/control.php | 4 ++-- module/instance/ui/view.html.php | 6 ++---- 9 files changed, 46 insertions(+), 47 deletions(-) diff --git a/module/action/lang/de.php b/module/action/lang/de.php index 7a0a3d619d..d91d453b5f 100644 --- a/module/action/lang/de.php +++ b/module/action/lang/de.php @@ -296,16 +296,16 @@ $lang->action->desc->install = '$date, installed by $act $lang->action->desc->uninstall = '$date, uninstalled by $actor.' . "\n"; $lang->action->desc->start = '$date, started by $actor.' . "\n"; $lang->action->desc->stop = '$date, closed by $actor.' . "\n"; -$lang->action->desc->editextra = '$date, updated from $oldname to $newName by $actor.' . "\n"; -$lang->action->desc->upgrade = '$date, upgraded from $oldVersion to $newVersion by $actor.' . "\n"; +$lang->action->desc->editextra = '$date, updated from $oldname to $newName by $actor.' . "\n"; +$lang->action->desc->upgrade = '$date, upgraded from $oldVersion to $newVersion by $actor.' . "\n"; $lang->action->desc->backup = '$date, backuped by $actor.' . "\n"; -$lang->action->desc->adjustmemory = '$date, resized to $newMemory of memory by $actor.' . "\n"; +$lang->action->desc->adjustmemory = '$date, resized to $newMemory of memory by $actor.' . "\n"; $lang->action->desc->enableldap = '$date, enabled by $actor of LDAP。' . "\n"; $lang->action->desc->disableldap = '$date, disabled by $actor of LDAP。' . "\n"; $lang->action->desc->enablesmtp = '$date, enabled by $actor of SMTP。' . "\n"; $lang->action->desc->disablesmtp = '$date, disabled by $actor of SMTP。' . "\n"; $lang->action->desc->updatecustom = '$date, updated by $actor of custom settings.' . "\n"; -$lang->action->desc->tosenior = '$date, upgraded from $oldAppName to $newAppName by $actor .' . "\n"; +$lang->action->desc->tosenior = '$date, upgraded from $oldAppName to $newAppName by $actor .' . "\n"; $lang->action->desc->saveautobackupsettings = '$date, opened by $actor of autobackup.' . "\n"; $lang->action->desc->closeautobackupsettings = '$date, closed by $actor of autobackup' . "\n"; $lang->action->desc->saveautorestoresettings = '$date, updated by $actor of autorestore.' . "\n"; diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 07e1f49cd2..fc4cfb0b12 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -296,16 +296,16 @@ $lang->action->desc->install = '$date, installed by $act $lang->action->desc->uninstall = '$date, uninstalled by $actor.' . "\n"; $lang->action->desc->start = '$date, started by $actor.' . "\n"; $lang->action->desc->stop = '$date, closed by $actor.' . "\n"; -$lang->action->desc->editextra = '$date, updated from $oldname to $newName by $actor.' . "\n"; -$lang->action->desc->upgrade = '$date, upgraded from $oldVersion to $newVersion by $actor.' . "\n"; +$lang->action->desc->editextra = '$date, updated from $oldname to $newName by $actor.' . "\n"; +$lang->action->desc->upgrade = '$date, upgraded from $oldVersion to $newVersion by $actor.' . "\n"; $lang->action->desc->backup = '$date, backuped by $actor.' . "\n"; -$lang->action->desc->adjustmemory = '$date, resized to $newMemory of memory by $actor.' . "\n"; +$lang->action->desc->adjustmemory = '$date, resized to $newMemory of memory by $actor.' . "\n"; $lang->action->desc->enableldap = '$date, enabled by $actor of LDAP。' . "\n"; $lang->action->desc->disableldap = '$date, disabled by $actor of LDAP。' . "\n"; $lang->action->desc->enablesmtp = '$date, enabled by $actor of SMTP。' . "\n"; $lang->action->desc->disablesmtp = '$date, disabled by $actor of SMTP。' . "\n"; $lang->action->desc->updatecustom = '$date, updated by $actor of custom settings.' . "\n"; -$lang->action->desc->tosenior = '$date, upgraded from $oldAppName to $newAppName by $actor .' . "\n"; +$lang->action->desc->tosenior = '$date, upgraded from $oldAppName to $newAppName by $actor .' . "\n"; $lang->action->desc->saveautobackupsettings = '$date, opened by $actor of autobackup.' . "\n"; $lang->action->desc->closeautobackupsettings = '$date, closed by $actor of autobackup' . "\n"; $lang->action->desc->saveautorestoresettings = '$date, updated by $actor of autorestore.' . "\n"; diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php index b07f380186..4e1409a263 100644 --- a/module/action/lang/fr.php +++ b/module/action/lang/fr.php @@ -296,16 +296,16 @@ $lang->action->desc->install = '$date, installed by $act $lang->action->desc->uninstall = '$date, uninstalled by $actor.' . "\n"; $lang->action->desc->start = '$date, started by $actor.' . "\n"; $lang->action->desc->stop = '$date, closed by $actor.' . "\n"; -$lang->action->desc->editextra = '$date, updated from $oldname to $newName by $actor.' . "\n"; -$lang->action->desc->upgrade = '$date, upgraded from $oldVersion to $newVersion by $actor.' . "\n"; +$lang->action->desc->editextra = '$date, updated from $oldname to $newName by $actor.' . "\n"; +$lang->action->desc->upgrade = '$date, upgraded from $oldVersion to $newVersion by $actor.' . "\n"; $lang->action->desc->backup = '$date, backuped by $actor.' . "\n"; -$lang->action->desc->adjustmemory = '$date, resized to $newMemory of memory by $actor.' . "\n"; +$lang->action->desc->adjustmemory = '$date, resized to $newMemory of memory by $actor.' . "\n"; $lang->action->desc->enableldap = '$date, enabled by $actor of LDAP。' . "\n"; $lang->action->desc->disableldap = '$date, disabled by $actor of LDAP。' . "\n"; $lang->action->desc->enablesmtp = '$date, enabled by $actor of SMTP。' . "\n"; $lang->action->desc->disablesmtp = '$date, disabled by $actor of SMTP。' . "\n"; $lang->action->desc->updatecustom = '$date, updated by $actor of custom settings.' . "\n"; -$lang->action->desc->tosenior = '$date, upgraded from $oldAppName to $newAppName by $actor .' . "\n"; +$lang->action->desc->tosenior = '$date, upgraded from $oldAppName to $newAppName by $actor .' . "\n"; $lang->action->desc->saveautobackupsettings = '$date, opened by $actor of autobackup.' . "\n"; $lang->action->desc->closeautobackupsettings = '$date, closed by $actor of autobackup' . "\n"; $lang->action->desc->saveautorestoresettings = '$date, updated by $actor of autorestore.' . "\n"; diff --git a/module/action/lang/vi.php b/module/action/lang/vi.php index fd3a600ec9..a3c4229c6b 100644 --- a/module/action/lang/vi.php +++ b/module/action/lang/vi.php @@ -221,16 +221,16 @@ $lang->action->desc->install = '$date, installed by $act $lang->action->desc->uninstall = '$date, uninstalled by $actor.' . "\n"; $lang->action->desc->start = '$date, started by $actor.' . "\n"; $lang->action->desc->stop = '$date, closed by $actor.' . "\n"; -$lang->action->desc->editextra = '$date, updated from $oldname to $newName by $actor.' . "\n"; -$lang->action->desc->upgrade = '$date, upgraded from $oldVersion to $newVersion by $actor.' . "\n"; +$lang->action->desc->editextra = '$date, updated from $oldname to $newName by $actor.' . "\n"; +$lang->action->desc->upgrade = '$date, upgraded from $oldVersion to $newVersion by $actor.' . "\n"; $lang->action->desc->backup = '$date, backuped by $actor.' . "\n"; -$lang->action->desc->adjustmemory = '$date, resized to $newMemory of memory by $actor.' . "\n"; +$lang->action->desc->adjustmemory = '$date, resized to $newMemory of memory by $actor.' . "\n"; $lang->action->desc->enableldap = '$date, enabled by $actor of LDAP。' . "\n"; $lang->action->desc->disableldap = '$date, disabled by $actor of LDAP。' . "\n"; $lang->action->desc->enablesmtp = '$date, enabled by $actor of SMTP。' . "\n"; $lang->action->desc->disablesmtp = '$date, disabled by $actor of SMTP。' . "\n"; $lang->action->desc->updatecustom = '$date, updated by $actor of custom settings.' . "\n"; -$lang->action->desc->tosenior = '$date, upgraded from $oldAppName to $newAppName by $actor .' . "\n"; +$lang->action->desc->tosenior = '$date, upgraded from $oldAppName to $newAppName by $actor .' . "\n"; $lang->action->desc->saveautobackupsettings = '$date, opened by $actor of autobackup.' . "\n"; $lang->action->desc->closeautobackupsettings = '$date, closed by $actor of autobackup' . "\n"; $lang->action->desc->saveautorestoresettings = '$date, updated by $actor of autorestore.' . "\n"; diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index df128e9bc3..69a6580225 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -292,20 +292,20 @@ $lang->action->desc->collected = '$date, 由 $actor 收藏 action->desc->uncollected = '$date, 由 $actor 取消收藏 $extra。' . "\n"; /* 用来描述应用的历史操作记录。*/ -$lang->action->desc->install = '$date, 由 $actor 安装 $extra。' . "\n"; -$lang->action->desc->uninstall = '$date, 由 $actor 卸载 $extra。' . "\n"; -$lang->action->desc->start = '$date, 由 $actor 启动 $extra。' . "\n"; -$lang->action->desc->stop = '$date, 由 $actor 关闭 $extra。' . "\n"; -$lang->action->desc->editname = '$date, 由 $actor 修改了名称，' . '从 $oldName 修改为 $newName' . '。' . "\n"; -$lang->action->desc->upgrade = '$date, 由 $actor 升级，从 $oldVersion 升级为 $newVersion 。' . "\n"; -$lang->action->desc->backup = '$date, 由 $actor 备份 $extra。' . "\n"; -$lang->action->desc->adjustmemory = '$date, 由 $actor 调整内存到 $newMemory 。' . "\n"; +$lang->action->desc->install = '$date, 由 $actor 安装。' . "\n"; +$lang->action->desc->uninstall = '$date, 由 $actor 卸载。' . "\n"; +$lang->action->desc->start = '$date, 由 $actor 启动。' . "\n"; +$lang->action->desc->stop = '$date, 由 $actor 关闭。' . "\n"; +$lang->action->desc->editname = '$date, 由 $actor 修改了名称，从 $oldName 修改为 $newName 。' . "\n"; +$lang->action->desc->upgrade = '$date, 由 $actor 升级，从 $oldVersion 升级为 $newVersion 。' . "\n"; +$lang->action->desc->backup = '$date, 由 $actor 备份。' . "\n"; +$lang->action->desc->adjustmemory = '$date, 由 $actor 调整内存到 $newMemory 。' . "\n"; $lang->action->desc->enableldap = '$date, 由 $actor 启用了LDAP。' . "\n"; $lang->action->desc->disableldap = '$date, 由 $actor 禁用了LDAP。' . "\n"; $lang->action->desc->enablesmtp = '$date, 由 $actor 启用了SMTP。' . "\n"; $lang->action->desc->disablesmtp = '$date, 由 $actor 禁用了SMTP。' . "\n"; $lang->action->desc->updatecustom = '$date, 由 $actor 修改了自定义配置。' . "\n"; -$lang->action->desc->tosenior = '$date, 由 $actor 升级服务到高级版，从 $oldAppName 升级到 $newAppName 。' . "\n"; +$lang->action->desc->tosenior = '$date, 由 $actor 升级服务到高级版，从 $oldAppName 升级到 $newAppName 。' . "\n"; $lang->action->desc->saveautobackupsettings = '$date, 由 $actor 修改了自动备份设置：开启自动备份。' . "\n"; $lang->action->desc->closeautobackupsettings = '$date, 由 $actor 修改了自动备份设置：自动备份已关闭。' . "\n"; $lang->action->desc->saveautorestoresettings = '$date, 由 $actor 修改了自动还原设置。' . "\n"; diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php index 73440ccf1e..f6b79e8350 100755 --- a/module/action/lang/zh-tw.php +++ b/module/action/lang/zh-tw.php @@ -225,20 +225,20 @@ $lang->action->desc->offline = '$date, 由 $actor $lang->action->desc->linkhost = '$date, 由 $actor 关联主机。' . "\n"; /* 用来描述应用的历史操作记录。*/ -$lang->action->desc->install = '$date, 由 $actor 安装 $extra。' . "\n"; -$lang->action->desc->uninstall = '$date, 由 $actor 卸载 $extra。' . "\n"; -$lang->action->desc->start = '$date, 由 $actor 启动 $extra。' . "\n"; -$lang->action->desc->stop = '$date, 由 $actor 关闭 $extra。' . "\n"; -$lang->action->desc->editextra = '$date, 由 $actor 修改了名称，' . '从 $oldName 修改为 $newName' . '。' . "\n"; -$lang->action->desc->upgrade = '$date, 由 $actor 升级，从 $oldVersion 升级为 $newVersion 。' . "\n"; -$lang->action->desc->backup = '$date, 由 $actor 备份 $extra。' . "\n"; -$lang->action->desc->adjustmemory = '$date, 由 $actor 调整内存到 $newMemory 。' . "\n"; +$lang->action->desc->install = '$date, 由 $actor 安装。' . "\n"; +$lang->action->desc->uninstall = '$date, 由 $actor 卸载。' . "\n"; +$lang->action->desc->start = '$date, 由 $actor 启动。' . "\n"; +$lang->action->desc->stop = '$date, 由 $actor 关闭。' . "\n"; +$lang->action->desc->editname = '$date, 由 $actor 修改了名称，从 $oldName 修改为 $newName 。' . "\n"; +$lang->action->desc->upgrade = '$date, 由 $actor 升级，从 $oldVersion 升级为 $newVersion 。' . "\n"; +$lang->action->desc->backup = '$date, 由 $actor 备份。' . "\n"; +$lang->action->desc->adjustmemory = '$date, 由 $actor 调整内存到 $newMemory 。' . "\n"; $lang->action->desc->enableldap = '$date, 由 $actor 启用了LDAP。' . "\n"; $lang->action->desc->disableldap = '$date, 由 $actor 禁用了LDAP。' . "\n"; $lang->action->desc->enablesmtp = '$date, 由 $actor 启用了SMTP。' . "\n"; $lang->action->desc->disablesmtp = '$date, 由 $actor 禁用了SMTP。' . "\n"; $lang->action->desc->updatecustom = '$date, 由 $actor 修改了自定义配置。' . "\n"; -$lang->action->desc->tosenior = '$date, 由 $actor 升级服务到高级版，从 $oldAppName 升级到 $newAppName 。' . "\n"; +$lang->action->desc->tosenior = '$date, 由 $actor 升级服务到高级版，从 $oldAppName 升级到 $newAppName 。' . "\n"; $lang->action->desc->saveautobackupsettings = '$date, 由 $actor 修改了自动备份设置：开启自动备份。' . "\n"; $lang->action->desc->closeautobackupsettings = '$date, 由 $actor 修改了自动备份设置：自动备份已关闭。' . "\n"; $lang->action->desc->saveautorestoresettings = '$date, 由 $actor 修改了自动还原设置。' . "\n"; diff --git a/module/instance/config.php b/module/instance/config.php index dcb9b437d4..81a443ef86 100644 --- a/module/instance/config.php +++ b/module/instance/config.php @@ -21,13 +21,14 @@ $config->instance->enableAutoRestore = in_array('auto-rollback', $features); global $lang, $app; $app->loadLang('space'); -$config->instance->actionList['start']['icon'] = 'play'; -$config->instance->actionList['start']['hint'] = $lang->instance->start; -$config->instance->actionList['start']['url'] = array('module' => 'instance', 'method' => 'visit', 'params' => 'id={id}&type={type}'); +$config->instance->actionList['start']['icon'] = 'play'; +$config->instance->actionList['start']['hint'] = $lang->instance->start; +$config->instance->actionList['start']['url'] = array('module' => 'instance', 'method' => 'ajaxStart', 'params' => 'id={id}'); -$config->instance->actionList['stop']['icon'] = 'off'; -$config->instance->actionList['stop']['hint'] = $lang->instance->stop; -$config->instance->actionList['stop']['url'] = array('module' => 'instance', 'method' => 'visit', 'params' => 'id={id}&type={type}'); +$config->instance->actionList['stop']['icon'] = 'off'; +$config->instance->actionList['stop']['hint'] = $lang->instance->stop; +$config->instance->actionList['stop']['data-confirm'] = $lang->instance->notices['confirmStop']; +$config->instance->actionList['stop']['url'] = array('module' => 'instance', 'method' => 'ajaxStop', 'params' => 'id={id}'); $config->instance->actionList['uninstall']['icon'] = 'trash'; $config->instance->actionList['uninstall']['hint'] = $lang->instance->uninstall; @@ -43,5 +44,5 @@ $config->instance->actionList['upgrade']['url'] = helper::createLink('instance' $config->instance->actions = new stdclass(); $config->instance->actions->view = array(); -$config->instance->actions->view['mainActions'] = array('start'); +$config->instance->actions->view['mainActions'] = array('start', 'stop', 'upgrade'); $config->instance->actions->view['suffixActions'] = array('uninstall'); \ No newline at end of file diff --git a/module/instance/control.php b/module/instance/control.php index cdf703a9ca..fd26f81916 100644 --- a/module/instance/control.php +++ b/module/instance/control.php @@ -490,7 +490,7 @@ class instance extends control $result = $this->instance->start($instance); $this->action->create('instance', $instance->id, 'start', '', json_encode(array('result' => $result, 'app' => array('alias' => $instance->appName, 'app_version' => $instance->version)))); - if($result->code == 200) return $this->send(array('result' => 'success', 'message' => zget($this->lang->instance->notices, 'startSuccess'))); + if($result->code == 200) return $this->send(array('result' => 'success', 'load' => true, 'message' => zget($this->lang->instance->notices, 'startSuccess'))); return $this->send(array('result' => 'fail', 'message' => zget($this->lang->instance->notices, 'startFail'))); } @@ -509,7 +509,7 @@ class instance extends control $result = $this->instance->stop($instance); $this->action->create('instance', $instance->id, 'stop', '', json_encode(array('result' => $result, 'app' => array('alias' => $instance->appName, 'app_version' => $instance->version)))); - if($result->code == 200) return $this->send(array('result' => 'success', 'message' => zget($this->lang->instance->notices, 'stopSuccess'))); + if($result->code == 200) return $this->send(array('result' => 'success', 'load' => true, 'message' => zget($this->lang->instance->notices, 'stopSuccess'))); return $this->send(array('result' => 'fail', 'message' => zget($this->lang->instance->notices, 'stopFail'))); } diff --git a/module/instance/ui/view.html.php b/module/instance/ui/view.html.php index c01f6847b1..c9dc93cffb 100644 --- a/module/instance/ui/view.html.php +++ b/module/instance/ui/view.html.php @@ -17,7 +17,6 @@ $setting = usePager('pager'); $cpuInfo = $this->instance->printCpuUsage($instance, $instanceMetric->cpu, 'array'); $memoryInfo = $this->instance->printMemUsage($instance, $instanceMetric->memory, 'array'); $actions = $this->loadModel('common')->buildOperateMenu($instance); -// $actions = array(); $dbListWg = array(); foreach($dbList as $db) @@ -191,8 +190,7 @@ div ), div ( - setClass('w-96'), + setStyle('width', '400px'), history() ) -); -\a($actions); \ No newline at end of file +); \ No newline at end of file