X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fview%2Fadmin_system%2Fupgrade.htm;h=03cd555c75247b832705bf79905760d88e6a749c;hp=16ba50cd989c562882c09439efb81961ce6610b1;hb=9ce58c0339f2b570c049c7bee04af66c3d695a39;hpb=97ff4a156ff1aa6a4d2ab65ab13d12b4eb2651e2

diff --git a/modules/admin-full/luasrc/view/admin_system/upgrade.htm b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
index 16ba50cd9..03cd555c7 100644
--- a/modules/admin-full/luasrc/view/admin_system/upgrade.htm
+++ b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
@@ -18,25 +18,26 @@ $Id$
 <p><%:a_s_flash_upgrade1%></p>
 <br />
 <% if sysupgrade and not ret then %>
-<form method="post" action="<%=luci.http.getenv("REQUEST_URI")%>" enctype="multipart/form-data">
-	<div class="cbi-section-node">
-		<div class="cbi-value clear">
-			<div class="cbi-value-title left"><%:a_s_flash_fwimage%></div>
-			<div class="cbi-value-field"><input type="file" size="30" name="image" /></div>
-		</div>
+<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 />
-		<div class="cbi-value clear">
-			<input type="checkbox" name="keepcfg" value="1" checked="checked" />
-			<span class="bold"><%:a_s_flash_keepcfg%></span>
-		</div>
 		<br />
-		<div>
-			<input type="submit" value="<%:a_s_flash_fwupgrade%>" />
-		</div>
+		<% if keep_avail then -%>
+		<input type="checkbox" name="keepcfg" value="1" checked="checked" />
+		<span class="bold"><%:a_s_flash_keepcfg%></span>
+		<% end -%>
+	</div>
+	<div>
+		<input type="submit" value="<%:a_s_flash_fwupgrade%>" />
 	</div>
 </form>
 <% elseif ret then %>
-	<% if ret == 0 then %>
+	<p><%:a_s_flash_received%></p>
+	<p><%:a_s_flash_inprogress%></p>
+	<% 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>