modules/admin-full: unify style of headings accross system menus, remove orphaned...

[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 569a0bbd278676c347175e4e266c2b113d71dee5..69fde9a683c6774e143c3f2660784c7e44b85739 100644 (file)
--- a/modules/admin-full/luasrc/view/admin_system/upgrade.htm
+++ b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
@@ -1,7 +1,7 @@
 <%#
 LuCI - Lua Configuration Interface
 Copyright 2008 Steven Barth <steven@midlink.org>
-Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+Copyright 2008-2009 Jo-Philipp Wich <xm@subsignal.org>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -12,40 +12,56 @@ You may obtain a copy of the License at
 $Id$
 
 -%>
+
 <%+header%>
-<h1><%:system%></h1>
-<h2><%:a_s_flash%></h2>
-<p><%:a_s_flash_upgrade1%></p>
-<br />
-<% if sysupgrade and not ret 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 />
-               <br />
-               <% 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 %>
-       <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> 
+
+<h2><a id="content" name="content"><%: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 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 %>
-<% else %>
-<div class="error"><%:a_s_flash_notimplemented%></div>
-<% end %>
-<%+footer%>
\ No newline at end of file
+
+</p>
+
+<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 class="cbi-button cbi-button-reset" type="submit" value="<%:Cancel%>" />
+       </form>
+       <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>
+</div>
+
+<%+footer%>