X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fluci-mod-admin-full%2Fluasrc%2Fview%2Fadmin_system%2Freboot.htm;h=c9551804d2aa352248920e85f28658f3cac40920;hp=aa7441d130e4dea9043496a4e05587a1a58778fd;hb=38a9993bd1bf0024639e19a9c25328a9d5d5954e;hpb=ada4a0ea98fbd8fa396cb601ace6c52f3857f5cc

diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/reboot.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/reboot.htm
index aa7441d13..c9551804d 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/reboot.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/reboot.htm
@@ -1,25 +1,59 @@
 <%#
  Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
+ Copyright 2008-2015 Jo-Philipp Wich <jow@openwrt.org>
  Licensed to the public under the Apache License 2.0.
 -%>
 
 <%+header%>
-<h2 name="content"><%:System%></h2>
-<h3><%:Reboot%></h3>
+
+<h2 name="content"><%:Reboot%></h2>
+<br />
+
 <p><%:Reboots the operating system of your device%></p>
-<%-
-local c = require("luci.model.uci").cursor():changes()
-if c and next(c) then
--%>
-	<p class="warning"><%:Warning: There are unsaved changes that will be lost while rebooting!%></p> 
-<%-
-end
-if not reboot then 
--%>
-<p><a href="<%=controller%>/admin/system/reboot?reboot=1"><%:Perform reboot%></a></p>
-<%- else -%>
-<p><%:Please wait: Device rebooting...%></p>
-<script type="text/javascript">setTimeout("location='<%=controller%>/admin'", 60000)</script>
+
+<%- local c = require("luci.model.uci").cursor():changes(); if c and next(c) then -%>
+	<p class="alert-message warning"><%:Warning: There are unsaved changes that will get lost on reboot!%></p>
 <%- end -%>
-<%+footer%>
\ No newline at end of file
+
+<hr />
+
+<script type="text/javascript">//<![CDATA[
+	var tries = 0;
+
+	function ok() {
+		window.location = '<%=controller%>/admin';
+	}
+
+	function check() {
+		if (tries++ < 12)
+			window.setTimeout(ping, 5000);
+		else
+			alert('<%:Device unreachable%>');
+	}
+
+	function ping() {
+		var img = document.createElement('img');
+
+		img.onload = ok;
+		img.onerror = check;
+		img.src = '<%=resource%>/icons/loading.gif?' + Math.random();
+
+		document.getElementById('reboot-message').innerHTML = '<%:Waiting for device...%>';
+	}
+
+	function reboot(button) {
+		button.style.display = 'none';
+		document.getElementById('reboot-message').parentNode.style.display = '';
+
+		(new XHR()).post('<%=controller%>/admin/system/reboot/call', { token: '<%=token%>' }, check);
+	}
+//]]></script>
+
+<input class="cbi-button cbi-button-apply" type="button" value="<%:Perform reboot%>" onclick="reboot(this)" />
+
+<p class="alert-message" style="display:none">
+	<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" />
+	<span id="reboot-message"><%:Device is rebooting...%></span>
+</p>
+
+<%+footer%>