NIU: More pages

5 files changed, 170 insertions, 2 deletions

diff --git a/modules/niu/luasrc/view/niu/network.htm b/modules/niu/luasrc/view/niu/network.htm
index a022b0af83..8644712312 100644
--- a/modules/niu/luasrc/view/niu/network.htm
+++ b/modules/niu/luasrc/view/niu/network.htm
@@ -1,13 +1,19 @@
 <%
 local dsp = require "luci.dispatcher"
 local utl = require "luci.util"
-local str = require "luci.store"
+local uci = require "luci.model.uci"
 
 local nws = {}
-str.uci_state:foreach("network", "interface", function(s)
+uci.inst_state:foreach("network", "interface", function(s)
 	nws[#nws+1] = s
 end)
+
+if uci.inst_state:get("network", "lan", "_ipchanged") and
+uci.inst_state:revert("network", "lan", "_ipchanged") then
+	include("niu/network/warn_ip_change")
+end
 %>
+
 <div>Status:</div>
 <table>
 <% 
diff --git a/modules/niu/luasrc/view/niu/network/warn_ip_change.htm b/modules/niu/luasrc/view/niu/network/warn_ip_change.htm
new file mode 100644
index 0000000000..b5ebdd73c6
--- /dev/null
+++ b/modules/niu/luasrc/view/niu/network/warn_ip_change.htm
@@ -0,0 +1,2 @@
+<strong>Warning!<br />
+Device IP has changed.</strong>
\ No newline at end of file
diff --git a/modules/niu/luasrc/view/niu/system/backup.htm b/modules/niu/luasrc/view/niu/system/backup.htm
new file mode 100644
index 0000000000..7e8c728236
--- /dev/null
+++ b/modules/niu/luasrc/view/niu/system/backup.htm
@@ -0,0 +1,41 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+<%+header%>
+<h2><a id="content" name="content"><%:System%></a></h2>
+<h3><%:Backup / Restore%></h3>
+<p><%:Here you can backup and restore your router configuration and - if possible - reset the router to the default settings.%></p>
+<br />
+<div>
+	<ul>
+	<li><a href="<%=REQUEST_URI%>?backup=kthxbye"><%:Create backup%></a></li>
+	<% if reset_avail then -%>
+	<li><a href="<%=REQUEST_URI%>?reset=yarly" onclick="return confirm('<%:Proceed reverting all settings and resetting to firmware defaults?%>')"><%:Reset router to defaults%></a></li>
+	<% end -%>
+	</ul>
+</div>
+
+<br />
+
+<form method="post" action="<%=REQUEST_URI%>" enctype="multipart/form-data">
+	<div class="left"><%:Backup Archive%>:</div>
+	<div>
+		<input type="file" size="30" name="archive" />
+	</div>
+	<div>
+		<input type="submit" name="cancel" class="cbi-input-cancel" value="<%:Cancel%>" />
+		<input type="submit" class="cbi-input-apply" value="<%:Restore backup%>" />
+	</div>
+</form>
+<%+footer%>
\ No newline at end of file
diff --git a/modules/niu/luasrc/view/niu/system/reboot.htm b/modules/niu/luasrc/view/niu/system/reboot.htm
new file mode 100644
index 0000000000..4b356d61e7
--- /dev/null
+++ b/modules/niu/luasrc/view/niu/system/reboot.htm
@@ -0,0 +1,14 @@
+Rebooting. Please wait...
+
+<script type="text/javascript">
+window.setInterval(function() {
+	var xmlHttp = new XMLHttpRequest();
+    xmlHttp.open('GET', '/', true);
+    xmlHttp.onreadystatechange = function () {
+        if (xmlHttp.readyState == 4 && req.status >= 200 && req.status < 400) {
+        	window.location = "/";
+        }
+    };
+    xmlHttp.send(null);
+}, 10000);
+</script>
\ No newline at end of file
diff --git a/modules/niu/luasrc/view/niu/system/upgrade.htm b/modules/niu/luasrc/view/niu/system/upgrade.htm
new file mode 100644
index 0000000000..1083a16188
--- /dev/null
+++ b/modules/niu/luasrc/view/niu/system/upgrade.htm
@@ -0,0 +1,105 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+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.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+
+<%+header%>
+
+<h2><a id="content" name="content"><%:System%></a></h2>
+<h3><%:Flash Firmware%></h3>
+
+<% 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>
+	<% 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 %>
+
+		<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>
+		</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%>
+