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

luci-app-advanced-reboot: change style of buttons to important
This commit is contained in:
Jo-Philipp Wich 2018-07-20 07:30:31 +02:00 committed by GitHub
commit f7cf8ff6c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 16 deletions

View file

@ -1,4 +1,4 @@
# Copyright (c) 2017 Stan Grishin (stangri@melmac.net) # Copyright 2017-2018 Stan Grishin (stangri@melmac.net)
# This is free software, licensed under the GNU General Public License v3. # This is free software, licensed under the GNU General Public License v3.
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
@ -13,7 +13,7 @@ LUCI_DESCRIPTION:=Provides Web UI (found under System/Advanced Reboot) to reboot
LUCI_DEPENDS:=+luci-mod-admin-full LUCI_DEPENDS:=+luci-mod-admin-full
LUCI_PKGARCH:=all LUCI_PKGARCH:=all
PKG_RELEASE:=32 PKG_RELEASE:=33
include ../../luci.mk include ../../luci.mk

View file

@ -1,4 +1,4 @@
-- Copyright 2017 Stan Grishin <stangri@melmac.net> -- Copyright 2017-2018 Stan Grishin <stangri@melmac.net>
-- Licensed to the public under the Apache License 2.0. -- Licensed to the public under the Apache License 2.0.
module("luci.controller.advanced_reboot", package.seeall) module("luci.controller.advanced_reboot", package.seeall)

View file

@ -1,7 +1,7 @@
<%# <%#
Copyright 2008 Steven Barth <steven@midlink.org> Copyright 2008 Steven Barth <steven@midlink.org>
Copyright 2008-2015 Jo-Philipp Wich <jow@openwrt.org> Copyright 2008-2015 Jo-Philipp Wich <jow@openwrt.org>
Copyright 2017 Stan Grishin <stangri@melmac.net> Copyright 2017-2018 Stan Grishin <stangri@melmac.net>
Licensed to the public under the Apache License 2.0. Licensed to the public under the Apache License 2.0.
-%> -%>
@ -42,12 +42,12 @@
<%- if boot_envvar1_partition_one == current_partition then -%> <%- if boot_envvar1_partition_one == 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" value="<%:Reboot to current partition%>" /> <input id="reboot-button" type="submit" class="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" value="<%:Reboot to alternative partition...%>" /> <input id="altreboot-button" type="submit" class="cbi-button cbi-button-apply important" value="<%:Reboot to alternative partition...%>" />
</form> </form>
<%- end -%> <%- end -%>
</div> </div>
@ -66,12 +66,12 @@
<%- if boot_envvar1_partition_two == current_partition then -%> <%- if boot_envvar1_partition_two == 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" value="<%:Reboot to current partition%>" /> <input id="reboot-button" type="submit" class="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" value="<%:Reboot to alternative partition...%>" /> <input id="altreboot-button" type="submit" class="cbi-button cbi-button-apply important" value="<%:Reboot to alternative partition...%>" />
</form> </form>
<%- end -%> <%- end -%>
</div> </div>
@ -82,7 +82,7 @@
<%- if rom_board_name then -%> <%- if rom_board_name then -%>
<p class="alert-message warning"><%=pcdata(translatef("Warning: Device (%s) is unknown or isn't a dual-partition device!", rom_board_name))%></p> <p class="alert-message warning"><%=pcdata(translatef("Warning: Device (%s) is unknown or isn't a dual-partition device!", rom_board_name))%></p>
<%- else -%> <%- else -%>
<p class="alert-message warning"><%:Warning: Unable to obtain device information!%></p> <p class="alert-message warning"><%=pcdata(translatef("Warning: Unable to obtain device information!"))%></p>
<%- end -%> <%- end -%>
<%- end -%> <%- end -%>
@ -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" value="<%:Perform power off...%>" /> <input id="poweroff-button" type="submit" class="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>

View file

@ -1,7 +1,7 @@
<%# <%#
Copyright 2008 Steven Barth <steven@midlink.org> Copyright 2008 Steven Barth <steven@midlink.org>
Copyright 2008-2009 Jo-Philipp Wich <jow@openwrt.org> Copyright 2008-2009 Jo-Philipp Wich <jow@openwrt.org>
Copyright 2017 Stan Grishin <stangri@melmac.net> Copyright 2017-2018 Stan Grishin <stangri@melmac.net>
Licensed to the public under the Apache License 2.0. Licensed to the public under the Apache License 2.0.
-%> -%>
@ -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" name="cancel" type="submit" value="<%:Cancel%>" /> <input class="cbi-button cbi-button-reset important" name="cancel" type="submit" value="<%:Cancel%>" />
<input class="cbi-button cbi-button-apply" type="submit" value="<%:Proceed%>" /> <input class="cbi-button cbi-button-apply important" type="submit" value="<%:Proceed%>" />
</form> </form>
</div> </div>

View file

@ -1,7 +1,7 @@
<%# <%#
Copyright 2008 Steven Barth <steven@midlink.org> Copyright 2008 Steven Barth <steven@midlink.org>
Copyright 2008-2009 Jo-Philipp Wich <jow@openwrt.org> Copyright 2008-2009 Jo-Philipp Wich <jow@openwrt.org>
Copyright 2017 Stan Grishin <stangri@melmac.net> Copyright 2017-2018 Stan Grishin <stangri@melmac.net>
Licensed to the public under the Apache License 2.0. Licensed to the public under the Apache License 2.0.
-%> -%>
@ -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" name="cancel" type="submit" value="<%:Cancel%>" /> <input class="cbi-button cbi-button-reset important" name="cancel" type="submit" value="<%:Cancel%>" />
<input class="cbi-button cbi-button-apply" type="submit" value="<%:Proceed%>" /> <input class="cbi-button cbi-button-apply important" type="submit" value="<%:Proceed%>" />
</form> </form>
</div> </div>