summaryrefslogtreecommitdiffhomepage
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/admin-full/luasrc/controller/admin/index.lua2
-rw-r--r--modules/admin-full/luasrc/view/admin_system/reboot.htm14
-rw-r--r--modules/admin-mini/luasrc/controller/mini/system.lua32
-rw-r--r--modules/admin-mini/luasrc/view/mini/reboot.htm33
-rw-r--r--modules/admin-mini/luasrc/view/mini/uci_changes.htm4
5 files changed, 79 insertions, 6 deletions
diff --git a/modules/admin-full/luasrc/controller/admin/index.lua b/modules/admin-full/luasrc/controller/admin/index.lua
index 430c5b82c5..9583f4f913 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 3ddfa5880e..600da36fcb 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
diff --git a/modules/admin-mini/luasrc/controller/mini/system.lua b/modules/admin-mini/luasrc/controller/mini/system.lua
new file mode 100644
index 0000000000..7b13e20c62
--- /dev/null
+++ b/modules/admin-mini/luasrc/controller/mini/system.lua
@@ -0,0 +1,32 @@
+--[[
+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$
+]]--
+
+module("luci.controller.mini.system", package.seeall)
+
+function index()
+ luci.i18n.loadc("admin-core")
+ local i18n = luci.i18n.translate
+
+ entry({"mini", "system"}, call("action_reboot"), i18n("system"))
+ entry({"mini", "system", "reboot"}, call("action_reboot"), i18n("reboot"), 10)
+end
+
+function action_reboot()
+ local reboot = luci.http.formvalue("reboot")
+ luci.template.render("mini/reboot", {reboot=reboot})
+ if reboot then
+ luci.sys.reboot()
+ end
+end \ No newline at end of file
diff --git a/modules/admin-mini/luasrc/view/mini/reboot.htm b/modules/admin-mini/luasrc/view/mini/reboot.htm
new file mode 100644
index 0000000000..600da36fcb
--- /dev/null
+++ b/modules/admin-mini/luasrc/view/mini/reboot.htm
@@ -0,0 +1,33 @@
+<%#
+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%>
+<h1><%:system%></h1>
+<h2><%:reboot%></h2>
+<p><%:a_s_reboot1%></p>
+<%-
+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 -%>
+<p><%:a_s_reboot_running%></p>
+<script type="text/javascript">setTimeout("location='<%=controller%>/admin'", 60000)</script>
+<%- end -%>
+<%+footer%> \ No newline at end of file
diff --git a/modules/admin-mini/luasrc/view/mini/uci_changes.htm b/modules/admin-mini/luasrc/view/mini/uci_changes.htm
index 09d8d3e7ee..ae601aa1f6 100644
--- a/modules/admin-mini/luasrc/view/mini/uci_changes.htm
+++ b/modules/admin-mini/luasrc/view/mini/uci_changes.htm
@@ -17,10 +17,10 @@ $Id$
<h2><%:changes%></h2>
<code><%=changes%></code>
<br /><br />
-<form class="inline" method="get" action="<%=controller%>/admin/uci/apply">
+<form class="inline" method="get" action="<%=controller%>/mini/uci/apply">
<input type="submit" value="<%:apply%>" />
</form>
-<form class="inline" method="get" action="<%=controller%>/admin/uci/revert">
+<form class="inline" method="get" action="<%=controller%>/mini/uci/revert">
<input type="submit" value="<%:revert%>" />
</form>
<%+footer%>