Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-app-advanced-reboot: import applyreboot template from luci-mod-system

Browse source 
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>
This commit is contained in:
Jo-Philipp Wich 2019-10-07 11:41:42 +02:00
parent b637cf6750
commit 90c52a1782
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua
View file

@ -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"

0
modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm → applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/applyreboot.htm
View file