diff options
| author | Steven Barth <steven@midlink.org> | 2008-09-12 11:53:08 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2008-09-12 11:53:08 +0000 |
| commit | fade8edd2dfe39ae579256d04220aba9da2ff074 (patch) | |
| tree | 79a61b456ee239333b4e8adbd5ce4223d32780b0 /modules/admin-full/luasrc/view | |
| parent | e0cfb49235b5890b24dbfcafeb5c7805327d6403 (diff) | |
Redesigned firmware upgrade process
Diffstat (limited to 'modules/admin-full/luasrc/view')
| -rw-r--r-- | modules/admin-full/luasrc/view/admin_system/upgrade.htm | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/modules/admin-full/luasrc/view/admin_system/upgrade.htm b/modules/admin-full/luasrc/view/admin_system/upgrade.htm index a3d97d649..40f3ec984 100644 --- a/modules/admin-full/luasrc/view/admin_system/upgrade.htm +++ b/modules/admin-full/luasrc/view/admin_system/upgrade.htm @@ -17,7 +17,7 @@ $Id$ <h2><%:a_s_flash%></h2> <p><%:a_s_flash_upgrade1%></p> <br /> -<% if sysupgrade and not ret then %> +<% if sysupgrade and ret == nil then %> <form method="post" action="<%=REQUEST_URI%>" enctype="multipart/form-data"> <div class="left"><%:a_s_flash_fwimage%>:</div> <div> @@ -33,20 +33,14 @@ $Id$ <input type="submit" value="<%:a_s_flash_fwupgrade%>" /> </div> </form> -<% elseif ret then %> - <p><%:a_s_flash_received%></p> - <p><%:a_s_flash_inprogress%></p> - -<!-- <%=string.rep(" ", 2048)%> --> - <% %> - <% local ret = ret() - if ret == 0 then %> -<div class="ok"><%:a_s_flash_flashed%></div> +<% elseif ret ~= nil then %> + <% if ret then %> +<p><%:a_s_flash_received%></p> +<p><%:a_s_flash_inprogress%></p> <% else %> -<div class="error"><%:a_s_flash_flasherr%>! (<%:code%> <%=ret%>)</div> +<div class="error"><%:a_s_flash_flasherr%>! (<%=err%>)</div> <% end %> <% else %> <div class="error"><%:a_s_flash_notimplemented%></div> <% end %> <%+footer%> -<% if ret == 0 then luci.sys.reboot() end %> |