diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2019-10-07 11:41:42 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2019-10-07 11:53:39 +0200 |
| commit | 90c52a1782ae7727c0a430dcec64d9c1b072e452 (patch) | |
| tree | d83435e65bc5a1142837db4538eaaafc449865cf | |
| parent | b637cf67502735d6ab9ee8a6deb1d1f323a2b15b (diff) | |
luci-app-advanced-reboot: import applyreboot template from luci-mod-system
Since the advanced-reboot app is the sole remaining user of the applyreboot
template, import it into this package to avoid the need for shipping it
with the default installation.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
| -rw-r--r-- | applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua | 6 | ||||
| -rw-r--r-- | applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/applyreboot.htm (renamed from modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm) | 0 |
2 files changed, 3 insertions, 3 deletions
diff --git a/applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua b/applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua index 7332424866..6b8cba4c40 100644 --- a/applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua +++ b/applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua @@ -89,7 +89,7 @@ end function action_reboot() local uci = require "luci.model.uci".cursor() local ip = uci:get("network", "lan", "ipaddr") - luci.template.render("admin_system/applyreboot", { + luci.template.render("advanced_reboot/applyreboot", { title = luci.i18n.translate("Rebooting..."), msg = luci.i18n.translate("The system is rebooting now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings."), addr = luci.ip.new(type(ip) == "string" and ip or "192.168.1.1") or "192.168.1.1" @@ -161,7 +161,7 @@ function action_altreboot() end end if not errorMessage then - luci.template.render("admin_system/applyreboot", { + luci.template.render("advanced_reboot/applyreboot", { title = luci.i18n.translate("Rebooting..."), msg = luci.i18n.translate("The system is rebooting to an alternative partition now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings."), addr = luci.ip.new(uci:get("network", "lan", "ipaddr")) or "192.168.1.1" @@ -195,7 +195,7 @@ function action_poweroff() luci.template.render("advanced_reboot/advanced_reboot",{}) end elseif step == 2 then - luci.template.render("admin_system/applyreboot", { + luci.template.render("advanced_reboot/applyreboot", { title = luci.i18n.translate("Shutting down..."), msg = luci.i18n.translate("The system is shutting down now.<br /> DO NOT POWER OFF THE DEVICE!<br /> It might be necessary to renew the address of your computer to reach the device again, depending on your settings."), addr = luci.ip.new(uci:get("network", "lan", "ipaddr")) or "192.168.1.1" diff --git a/modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm b/applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/applyreboot.htm index e235bd4679..e235bd4679 100644 --- a/modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm +++ b/applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/applyreboot.htm |