diff options
| author | Steven Barth <steven@midlink.org> | 2008-09-18 19:23:08 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2008-09-18 19:23:08 +0000 |
| commit | 5067e2d185bbd1fdf029a8da2a84895bbccfad02 (patch) | |
| tree | d0caa1289fce35bacaae1f1055aaa8317828cf13 /modules/admin-full/luasrc/view | |
| parent | 60579b28e861af7780b596eca70a547b4bb779d1 (diff) | |
Revised sysupgrade part 1
Diffstat (limited to 'modules/admin-full/luasrc/view')
| -rw-r--r-- | modules/admin-full/luasrc/view/admin_system/upgrade.htm | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/modules/admin-full/luasrc/view/admin_system/upgrade.htm b/modules/admin-full/luasrc/view/admin_system/upgrade.htm index a3d97d6497..693022f323 100644 --- a/modules/admin-full/luasrc/view/admin_system/upgrade.htm +++ b/modules/admin-full/luasrc/view/admin_system/upgrade.htm @@ -17,12 +17,13 @@ $Id$ <h2><%:a_s_flash%></h2> <p><%:a_s_flash_upgrade1%></p> <br /> -<% if sysupgrade and not ret then %> +<% if next(blocks) and not next(flash) then %> <form method="post" action="<%=REQUEST_URI%>" enctype="multipart/form-data"> <div class="left"><%:a_s_flash_fwimage%>:</div> <div> - <input type="file" size="30" name="image" /> - <br /> + <% for name, v in pairs(blocks) do %> + <%=name%>: <input type="file" size="30" name="<%=name%>" /><br /> + <% end %> <br /> <% if keep_avail then -%> <input type="checkbox" name="keepcfg" value="1" checked="checked" /> @@ -33,20 +34,23 @@ $Id$ <input type="submit" value="<%:a_s_flash_fwupgrade%>" /> </div> </form> -<% elseif ret then %> +<% elseif next(flash) 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> - <% else %> -<div class="error"><%:a_s_flash_flasherr%>! (<%:code%> <%=ret%>)</div> + <% reboot.exec = false + for name, func in pairs(flash) do %> + <%:a_s_flash_inprogress%> <%=name%>... + <%=string.rep(" ", 2048)%> + <% + local stat, code = func() + reboot.exec = reboot.exec or stat + if stat and code then %> + <%:a_s_flash_flashed%><br /> + <% else %> + <%:a_s_flash_flasherr%>! (<%:code%> <%=code%>)<br /> + <% end %> <% end %> <% else %> <div class="error"><%:a_s_flash_notimplemented%></div> <% end %> -<%+footer%> -<% if ret == 0 then luci.sys.reboot() end %> +<%+footer%>
\ No newline at end of file |