modules/admin-full: rework system menu area

[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 372fa59..950eba8 100644 (file)
--- a/modules/admin-full/luasrc/view/admin_system/upgrade.htm
+++ b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
@@ -15,96 +15,53 @@ $Id$
 
 <%+header%>
 
-<h2><a id="content" name="content"><%:System%></a></h2>
-<h3><%:Flash Firmware%></h3>
+<h2><a id="content" name="content"><%:System%> - <%:Flash Firmware%> - <%:Verify%></a></h2>
+<p>
+       <%_ The flash image was uploaded.
+               Below is the checksum and file size listed,
+               compare them with the original file to ensure data integrity.<br />
+               Click "Proceed" below to start the flash procedure. %>
 
-<% if step == 1 then %>
-       <% if supported then %>
-       <form method="post" action="<%=REQUEST_URI%>" enctype="multipart/form-data">
-       <p>
-               <%:Upload an OpenWrt image file to reflash the device.%>
-               <% if bad_image then %>
-                       <br /><br />
-                       <div class="error"><%:The uploaded image file does not
-                               contain a supported format. Make sure that you choose the generic
-                               image format for your platform. %></div>
-               <% end %>
-       </p>
-       <div>
-               <%:Firmware image%>:<br />
-               <input type="hidden" name="step" value="2" />
-               <input type="file" size="30" name="image" />
-               <br />
-               <br />
-               <% if keepavail then -%>
-               <input type="checkbox" name="keepcfg" value="1" checked="checked" />
-               <span class="bold"><%:Keep configuration files%></span>
-               <% end -%>
-
-               <br />
-               <input class="cbi-button cbi-button-apply" type="submit" value="<%:Upload image%>" />
-       </div>
-       </form>
-       <% else %>
-               <div class="error"><%_ Sorry.
-                       OpenWrt does not support a system upgrade on this platform.<br />
-                       You need to manually flash your device. %></div>
+       <% if storage > 0 and size > storage then %>
+               <br /><br />
+               <div class="error"><%:It appears that you try to
+                       flash an image that does not fit into the flash memory, please verify
+                       the image file! %></div>
        <% end %>
-<% elseif step == 2 then %>
-       <p>
-               <%_ The flash image was uploaded.
-                       Below is the checksum and file size listed,
-                       compare them with the original file to ensure data integrity.<br />
-                       Click "Proceed" below to start the flash procedure. %>
 
-               <% if flashsize > 0 and filesize > flashsize then %>
-                       <br /><br />
-                       <div class="error"><%:It appears that you try to
-                               flash an image that does not fit into the flash memory, please verify
-                               the image file! %></div>
-               <% end %>
+</p>
 
-               <br />
-               <ul>
-                       <li><%:Checksum%>: <code><%=checksum%></code></li>
-                       <li><%:Size%>: <%
-                               local w = require "luci.tools.webadmin"
-                               write(w.byte_format(filesize))
-       
-                               if flashsize > 0 then
-                                       write(luci.i18n.translatef(
-                                               " (%s available)",
-                                               w.byte_format(flashsize)
-                                       ))
-                               end
-                       %></li>
-                       <li><% if keepconfig then %>
-                               <%:Configuration files will be kept.%>
-                       <% else %>
-                               <%:Note: Configuration files will be erased.%>
-                       <% end %></li>
-               </ul>
-       </p>
-       <div class="cbi-page-actions right">
-               <form style="display:inline">
-                       <input type="hidden" name="step" value="3" />
-                       <input type="hidden" name="keepcfg" value="<%=keepconfig and "1" or "0"%>" />
-                       <input class="cbi-button cbi-button-apply" type="submit" value="<%:Proceed%>" />        
-               </form>
-               <form style="display:inline">
-                       <input type="hidden" name="step" value="1" />
-                       <input type="hidden" name="keepcfg" value="<%=keepconfig and "1" or "0"%>" />
-                       <input class="cbi-button cbi-button-reset" type="submit" value="<%:Cancel%>" />
-               </form>
-       </div>
-<% elseif step == 3 then %>
-       <p><%_ The system is flashing now.<br />
-               DO NOT POWER OFF THE DEVICE!<br />
-               Wait a few minutes until you try to reconnect.
-               It might be necessary to renew the address of your computer to reach the device
-               again, depending on your settings. %></p>
-               
-       <iframe src="<%=REQUEST_URI%>?step=4&#38;keepcfg=<%=keepconfig and "1" or "0"%>" style="border:1px solid black; width:100%; height:150px"></iframe>
-<% end %>
-<%+footer%>
+<fieldset class="cbi-section">
+       <ul>
+               <li><%:Checksum%>: <code><%=checksum%></code></li>
+               <li><%:Size%>: <%
+                       local w = require "luci.tools.webadmin"
+                       write(w.byte_format(size))
+
+                       if storage > 0 then
+                               write(luci.i18n.translatef(
+                                       " (%s available)",
+                                       w.byte_format(storage)
+                               ))
+                       end
+               %></li>
+               <li><% if keep then %>
+                       <%:Configuration files will be kept.%>
+               <% else %>
+                       <%:Note: Configuration files will be erased.%>
+               <% end %></li>
+       </ul>
+</fieldset>
 
+<div class="cbi-page-actions right">
+       <form style="display:inline" action="<%=REQUEST_URI%>" method="post">
+               <input type="hidden" name="step" value="2" />
+               <input type="hidden" name="keep" value="<%=keep and "1" or ""%>" />
+               <input class="cbi-button cbi-button-apply" type="submit" value="<%:Proceed%>" />
+       </form>
+       <form style="display:inline" action="<%=REQUEST_URI%>" method="post">
+               <input class="cbi-button cbi-button-reset" type="submit" value="<%:Cancel%>" />
+       </form>
+</div>
+
+<%+footer%>