Made flashing more responsive as well

[project/luci.git] / modules / admin-full / luasrc / view / admin_system / upgrade.htm

diff --git a/modules/admin-full/luasrc/view/admin_system/upgrade.htm b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
index 350d6a8..03cd555 100644 (file)
--- a/modules/admin-full/luasrc/view/admin_system/upgrade.htm
+++ b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
@@ -24,15 +24,20 @@ $Id$
                <input type="file" size="30" name="image" />
                <br />
                <br />
                <input type="file" size="30" name="image" />
                <br />
                <br />

+               <% if keep_avail then -%>

                <input type="checkbox" name="keepcfg" value="1" checked="checked" />
                <span class="bold"><%:a_s_flash_keepcfg%></span>
                <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 %>
        </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> 
 <div class="ok"><%:a_s_flash_flashed%></div>
        <% else %>
 <div class="error"><%:a_s_flash_flasherr%>! (<%:code%> <%=ret%>)</div>