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

Merge pull request #4384 from stangri/master-luci-app-advanced-reboot

Browse source 
luci-app-advanced-reboot: bugifx: btn style; board names for some Linksys devices
This commit is contained in:
Stan 2020-08-23 19:17:41 -07:00 committed by GitHub
commit 2d1613d0eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 41 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/luci-app-advanced-reboot/Makefile
View file

@ -12,7 +12,7 @@ LUCI_DESCRIPTION:=Provides Web UI (found under System/Advanced Reboot) to reboot
routers are listed at https://github.com/openwrt/luci/blob/master/applications/luci-app-advanced-reboot/README.md routers are listed at https://github.com/openwrt/luci/blob/master/applications/luci-app-advanced-reboot/README.md
LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full
LUCI_PKGARCH:=all LUCI_PKGARCH:=all
PKG_RELEASE:=54 PKG_RELEASE:=55
include ../../luci.mk include ../../luci.mk

2
applications/luci-app-advanced-reboot/README.md
View file

@ -1,5 +1,7 @@
# Advanced Reboot Web UI (luci-app-advanced-reboot) # Advanced Reboot Web UI (luci-app-advanced-reboot)
[![HitCount](http://hits.dwyl.com/stangri/openwrt/luci-app-advanced-reboot.svg)](http://hits.dwyl.com/stangri/openwrt/luci-app-advanced-reboot)
## Description ## Description
This package allows you to reboot to an alternative partition on the supported (dual-partition) routers and to power off (power down) your OpenWrt device. This package allows you to reboot to an alternative partition on the supported (dual-partition) routers and to power off (power down) your OpenWrt device.

14
applications/luci-app-advanced-reboot/luasrc/advanced-reboot/devices/linksys-e4200v2.lua Normal file
View file

@ -0,0 +1,14 @@
return {
vendorName = "Linksys",
deviceName = "E4200v2",
boardNames = { "linksys-e4200v2", "linksys,e4200v2" },
partition1MTD = "mtd3",
partition2MTD = "mtd5",
labelOffset = 32,
bootEnv1 = "boot_part",
bootEnv1Partition1Value = 1,
bootEnv1Partition2Value = 2,
bootEnv2 = "bootcmd",
bootEnv2Partition1Value = "run nandboot",
bootEnv2Partition2Value = "run altnandboot"
}

2
applications/luci-app-advanced-reboot/luasrc/advanced-reboot/devices/linksys-ea3500.lua
View file

@ -1,7 +1,7 @@
return { return {
vendorName = "Linksys", vendorName = "Linksys",
deviceName = "EA3500", deviceName = "EA3500",
boardNames = { "linksys-audi", "linksys,audi" }, boardNames = { "linksys-audi", "linksys,audi", "linksys-ea3500", "linksys,ea3500" },
partition1MTD = "mtd3", partition1MTD = "mtd3",
partition2MTD = "mtd5", partition2MTD = "mtd5",
labelOffset = 32, labelOffset = 32,

14
applications/luci-app-advanced-reboot/luasrc/advanced-reboot/devices/linksys-ea4500.lua Normal file
View file

@ -0,0 +1,14 @@
return {
vendorName = "Linksys",
deviceName = "EA4500",
boardNames = { "linksys-e4500", "linksys,e4500" },
partition1MTD = "mtd3",
partition2MTD = "mtd5",
labelOffset = 32,
bootEnv1 = "boot_part",
bootEnv1Partition1Value = 1,
bootEnv1Partition2Value = 2,
bootEnv2 = "bootcmd",
bootEnv2Partition1Value = "run nandboot",
bootEnv2Partition2Value = "run altnandboot"
}

10
applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm
View file

@ -42,12 +42,12 @@
<%- if bev1p1 == current_partition then -%> <%- if bev1p1 == current_partition then -%>
<form method="post" action="<%=url('admin/system/advanced_reboot/reboot')%>"> <form method="post" action="<%=url('admin/system/advanced_reboot/reboot')%>">
<input type="hidden" name="token" value="<%=token%>" /> <input type="hidden" name="token" value="<%=token%>" />
<input id="reboot-button" type="submit" class="cbi-button cbi-button-apply important" value="<%:Reboot to current partition%>" /> <input id="reboot-button" type="submit" class="btn cbi-button cbi-button-apply important" value="<%:Reboot to current partition%>" />
</form> </form>
<%- else -%> <%- else -%>
<form method="post" action="<%=url('admin/system/advanced_reboot/alternative_reboot')%>"> <form method="post" action="<%=url('admin/system/advanced_reboot/alternative_reboot')%>">
<input type="hidden" name="token" value="<%=token%>" /> <input type="hidden" name="token" value="<%=token%>" />
<input id="altreboot-button" type="submit" class="cbi-button cbi-button-apply important" value="<%:Reboot to alternative partition...%>" /> <input id="altreboot-button" type="submit" class="btn cbi-button cbi-button-apply important" value="<%:Reboot to alternative partition...%>" />
</form> </form>
<%- end -%> <%- end -%>
</div> </div>
@ -66,12 +66,12 @@
<%- if bev1p2 == current_partition then -%> <%- if bev1p2 == current_partition then -%>
<form method="post" action="<%=url('admin/system/advanced_reboot/reboot')%>"> <form method="post" action="<%=url('admin/system/advanced_reboot/reboot')%>">
<input type="hidden" name="token" value="<%=token%>" /> <input type="hidden" name="token" value="<%=token%>" />
<input id="reboot-button" type="submit" class="cbi-button cbi-button-apply important" value="<%:Reboot to current partition%>" /> <input id="reboot-button" type="submit" class="btn cbi-button cbi-button-apply important" value="<%:Reboot to current partition%>" />
</form> </form>
<%- else -%> <%- else -%>
<form method="post" action="<%=url('admin/system/advanced_reboot/alternative_reboot')%>"> <form method="post" action="<%=url('admin/system/advanced_reboot/alternative_reboot')%>">
<input type="hidden" name="token" value="<%=token%>" /> <input type="hidden" name="token" value="<%=token%>" />
<input id="altreboot-button" type="submit" class="cbi-button cbi-button-apply important" value="<%:Reboot to alternative partition...%>" /> <input id="altreboot-button" type="submit" class="btn cbi-button cbi-button-apply important" value="<%:Reboot to alternative partition...%>" />
</form> </form>
<%- end -%> <%- end -%>
</div> </div>
@ -91,7 +91,7 @@
<%- if nixio.fs.access("/sbin/poweroff") then -%> <%- if nixio.fs.access("/sbin/poweroff") then -%>
<form method="post" action="<%=url('admin/system/advanced_reboot/power_off')%>"> <form method="post" action="<%=url('admin/system/advanced_reboot/power_off')%>">
<input type="hidden" name="token" value="<%=token%>" /> <input type="hidden" name="token" value="<%=token%>" />
<input id="poweroff-button" type="submit" class="cbi-button cbi-button-apply important" value="<%:Perform power off...%>" /> <input id="poweroff-button" type="submit" class="btn cbi-button cbi-button-apply important" value="<%:Perform power off...%>" />
</form> </form>
<%- else -%> <%- else -%>
<p class="alert-message warning"><%:Warning: This system does not support powering off!%></p> <p class="alert-message warning"><%:Warning: This system does not support powering off!%></p>

4
applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/alternative_reboot.htm
View file

@ -21,8 +21,8 @@
<form class="inline" action="<%=REQUEST_URI%>" method="post"> <form class="inline" action="<%=REQUEST_URI%>" method="post">
<input type="hidden" name="token" value="<%=token%>" /> <input type="hidden" name="token" value="<%=token%>" />
<input type="hidden" name="step" value="2" /> <input type="hidden" name="step" value="2" />
<input class="cbi-button cbi-button-reset important" name="cancel" type="submit" value="<%:Cancel%>" /> <input class="btn cbi-button cbi-button-reset important" name="cancel" type="submit" value="<%:Cancel%>" />
<input class="cbi-button cbi-button-apply important" type="submit" value="<%:Proceed%>" /> <input class="btn cbi-button cbi-button-apply important" type="submit" value="<%:Proceed%>" />
</form> </form>
</div> </div>

4
applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/power_off.htm
View file

@ -17,8 +17,8 @@
<form class="inline" action="<%=REQUEST_URI%>" method="post"> <form class="inline" action="<%=REQUEST_URI%>" method="post">
<input type="hidden" name="token" value="<%=token%>" /> <input type="hidden" name="token" value="<%=token%>" />
<input type="hidden" name="step" value="2" /> <input type="hidden" name="step" value="2" />
<input class="cbi-button cbi-button-reset important" name="cancel" type="submit" value="<%:Cancel%>" /> <input class="btn cbi-button cbi-button-reset important" name="cancel" type="submit" value="<%:Cancel%>" />
<input class="cbi-button cbi-button-apply important" type="submit" value="<%:Proceed%>" /> <input class="btn cbi-button cbi-button-apply important" type="submit" value="<%:Proceed%>" />
</form> </form>
</div> </div>