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

modules/admin-full: fixes for upgrade pages:

Browse source 
- do not show a size warning if media size is unknown
	- handle unsupported platforms gracefully
	- i18n tag cleanup
This commit is contained in:
Jo-Philipp Wich 2009-05-09 02:26:13 +00:00
parent 2fabf92cf0
commit fd31bb2fcc
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/admin-full/luasrc/controller/admin/system.lua
View file

@ -2,6 +2,7 @@
LuCI - Lua Configuration Interface LuCI - Lua Configuration Interface
Copyright 2008 Steven Barth <steven@midlink.org> Copyright 2008 Steven Barth <steven@midlink.org>
Copyright 2008-2009 Jo-Philipp Wich <xm@subsignal.org>
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -278,7 +279,8 @@ function action_upgrade()
luci.template.render("admin_system/upgrade", { luci.template.render("admin_system/upgrade", {
step=1, step=1,
bad_image=(has_image and not has_support or false), bad_image=(has_image and not has_support or false),
keepavail=keep_avail keepavail=keep_avail,
supported=has_platform
} ) } )
-- Step 2: present uploaded file, show checksum, confirmation -- Step 2: present uploaded file, show checksum, confirmation

14
modules/admin-full/luasrc/view/admin_system/upgrade.htm
View file

@ -16,12 +16,13 @@ $Id$
<%+header%> <%+header%>
<h2><a id="content" name="content"><%:system%></a></h2> <h2><a id="content" name="content"><%:system%></a></h2>
<h3><%:a_s_flash%></h3> <h3><%:admin_upgrade Flash Firmware%></h3>
<% if step == 1 then %> <% if step == 1 then %>
<% if supported then %>
<form method="post" action="<%=REQUEST_URI%>" enctype="multipart/form-data"> <form method="post" action="<%=REQUEST_URI%>" enctype="multipart/form-data">
<p> <p>
<%:admin_upgrade Upload an OpenWrt image file to reflash the device.%> <%:admin_upgrade_desc Upload an OpenWrt image file to reflash the device.%>
<% if bad_image then %> <% if bad_image then %>
<br /><br /> <br /><br />
<div class="error"><%:admin_upgrade_badimage The uploaded image file does not <div class="error"><%:admin_upgrade_badimage The uploaded image file does not
@ -37,13 +38,18 @@ $Id$
<br /> <br />
<% if keepavail then -%> <% if keepavail then -%>
<input type="checkbox" name="keepcfg" value="1" checked="checked" /> <input type="checkbox" name="keepcfg" value="1" checked="checked" />
<span class="bold"><%:a_s_flash_keepcfg%></span> <span class="bold"><%:admin_upgrade_keepcfg Keep configuration files%></span>
<% end -%> <% end -%>
<br /> <br />
<input class="cbi-button cbi-button-apply" type="submit" value="<%:admin_upgrade_upload Upload image%>" /> <input class="cbi-button cbi-button-apply" type="submit" value="<%:admin_upgrade_upload Upload image%>" />
</div> </div>
</form> </form>
<% else %>
<div class="error"><%:admin_upgrade_nosupport Sorry.
OpenWrt does not support a system upgrade on this platform.<br />
You need to manually flash your device. %></div>
<% end %>
<% elseif step == 2 then %> <% elseif step == 2 then %>
<p> <p>
<%:admin_upgrade_uploaded The flash image was uploaded. <%:admin_upgrade_uploaded The flash image was uploaded.
@ -51,7 +57,7 @@ $Id$
compare them with the original file to ensure data integrity.<br /> compare them with the original file to ensure data integrity.<br />
Click "Proceed" below to start the flash procedure. %> Click "Proceed" below to start the flash procedure. %>
<% if filesize > flashsize then %> <% if flashsize > 0 and filesize > flashsize then %>
<br /><br /> <br /><br />
<div class="error"><%:admin_upgrade_toolarge It appears that you try to <div class="error"><%:admin_upgrade_toolarge It appears that you try to
flash an image that does not fit in the flash memory, please verify flash an image that does not fit in the flash memory, please verify