summaryrefslogtreecommitdiffhomepage
path: root/modules/admin-full
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-07-16 10:48:39 +0000
committerSteven Barth <steven@midlink.org>2008-07-16 10:48:39 +0000
commit65cde96c5b05e04c24b0f272b577df67193d7c0b (patch)
tree7d1b59b19dc77b860045f9197c2c63985e48571d /modules/admin-full
parent429473aed896a8f038d8934c8711a29366a894c5 (diff)
Several small cleanups and improvements
modules/admin-mini: Added reboot page
Diffstat (limited to 'modules/admin-full')
-rw-r--r--modules/admin-full/luasrc/controller/admin/index.lua2
-rw-r--r--modules/admin-full/luasrc/view/admin_system/reboot.htm14
2 files changed, 12 insertions, 4 deletions
diff --git a/modules/admin-full/luasrc/controller/admin/index.lua b/modules/admin-full/luasrc/controller/admin/index.lua
index 430c5b82c..9583f4f91 100644
--- a/modules/admin-full/luasrc/controller/admin/index.lua
+++ b/modules/admin-full/luasrc/controller/admin/index.lua
@@ -41,7 +41,7 @@ function index()
page.target = cbi("admin_index/luci")
page.title = i18n("a_i_ui", "Oberfläche")
- entry({"admin", "logout"}, call("action_logout"), i18n("logout"))
+ entry({"admin", "index", "logout"}, call("action_logout"), i18n("logout"))
end
function action_logout()
diff --git a/modules/admin-full/luasrc/view/admin_system/reboot.htm b/modules/admin-full/luasrc/view/admin_system/reboot.htm
index 3ddfa5880..600da36fc 100644
--- a/modules/admin-full/luasrc/view/admin_system/reboot.htm
+++ b/modules/admin-full/luasrc/view/admin_system/reboot.htm
@@ -16,10 +16,18 @@ $Id$
<h1><%:system%></h1>
<h2><%:reboot%></h2>
<p><%:a_s_reboot1%></p>
-<% if not reboot then %>
+<%-
+local c = require("luci.model.uci").changes()
+if c and next(c) then
+-%>
+ <p class="warning"><%:a_s_reboot_u%></p>
+<%-
+end
+if not reboot then
+-%>
<p><a href="<%=controller%>/admin/system/reboot?reboot=1"><%:a_s_reboot_do%></a></p>
-<% else %>
+<%- else -%>
<p><%:a_s_reboot_running%></p>
<script type="text/javascript">setTimeout("location='<%=controller%>/admin'", 60000)</script>
-<% end %>
+<%- end -%>
<%+footer%> \ No newline at end of file