summaryrefslogtreecommitdiffhomepage
path: root/modules
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-05-13 17:32:11 +0000
committerSteven Barth <steven@midlink.org>2008-05-13 17:32:11 +0000
commitbac04441f11f29b53d6c24ed9a32244cd95dce25 (patch)
treecbdf5d92d5cda4236dec4e63b03aa2349731f33a /modules
parentfbc9bf4c5bfaa0add3c7f5ad947d7bc20d79aedb (diff)
* modules/admin-core: Reintroduced ffluci.controller.admin.status
* modules/admin-core: Added Syslog status page
Diffstat (limited to 'modules')
-rw-r--r--modules/admin-core/src/controller/admin/status.lua6
-rw-r--r--modules/admin-core/src/model/menu/00admin.lua3
-rw-r--r--modules/admin-core/src/view/admin_status/index.htm7
-rw-r--r--modules/admin-core/src/view/admin_status/syslog.htm5
-rw-r--r--modules/admin-core/src/view/admin_uci/changes.htm2
5 files changed, 22 insertions, 1 deletions
diff --git a/modules/admin-core/src/controller/admin/status.lua b/modules/admin-core/src/controller/admin/status.lua
new file mode 100644
index 000000000..fa9fe65bd
--- /dev/null
+++ b/modules/admin-core/src/controller/admin/status.lua
@@ -0,0 +1,6 @@
+module("ffluci.controller.admin.status", package.seeall)
+
+function action_syslog()
+ local syslog = ffluci.sys.syslog()
+ ffluci.template.render("admin_status/syslog", {syslog=syslog})
+end \ No newline at end of file
diff --git a/modules/admin-core/src/model/menu/00admin.lua b/modules/admin-core/src/model/menu/00admin.lua
index c48db19bd..b21e5e338 100644
--- a/modules/admin-core/src/model/menu/00admin.lua
+++ b/modules/admin-core/src/model/menu/00admin.lua
@@ -1,6 +1,9 @@
add("admin", "index", "Übersicht", 10)
act("luci", "Oberfläche")
+add("admin", "status", "Status", 20)
+act("syslog", "Systemprotokoll")
+
add("admin", "system", "System", 30)
act("packages", "Paketverwaltung")
act("passwd", "Passwort ändern")
diff --git a/modules/admin-core/src/view/admin_status/index.htm b/modules/admin-core/src/view/admin_status/index.htm
new file mode 100644
index 000000000..984093693
--- /dev/null
+++ b/modules/admin-core/src/view/admin_status/index.htm
@@ -0,0 +1,7 @@
+<%+header%>
+<h1><%:status Status%></h1>
+<p><%:status1 Hier finden sich Informationen über den aktuellen Status des Systems, beispielsweise
+Prozessortakt, Speicherauslastung und Netzwerkschnittstellen.%></p>
+<p><%:status2 Zusätzlich können hier Protokolldaten, des Kernels und diverser Systemdienste eingesehen werden,
+um deren Zustand zu kontrollieren.%></p>
+<%+footer%> \ No newline at end of file
diff --git a/modules/admin-core/src/view/admin_status/syslog.htm b/modules/admin-core/src/view/admin_status/syslog.htm
new file mode 100644
index 000000000..905161be2
--- /dev/null
+++ b/modules/admin-core/src/view/admin_status/syslog.htm
@@ -0,0 +1,5 @@
+<%+header%>
+<h1><%:status Status%></h1>
+<h2><%:syslog Systemprotokoll%></h2>
+<code><%=syslog%></code>
+<%+footer%> \ No newline at end of file
diff --git a/modules/admin-core/src/view/admin_uci/changes.htm b/modules/admin-core/src/view/admin_uci/changes.htm
index 3bbcd0e5f..52efb4589 100644
--- a/modules/admin-core/src/view/admin_uci/changes.htm
+++ b/modules/admin-core/src/view/admin_uci/changes.htm
@@ -1,7 +1,7 @@
<%+header%>
<h1><%:config Konfiguration%></h1>
<h2><%:changes Änderungen%></h2>
-<code><%=(ffluci.model.uci.changes() or "-")%></code>
+<code><%=ffluci.model.uci.changes()%></code>
<form class="inline" method="get" action="<%=controller%>/admin/uci/apply">
<input type="submit" value="<%:apply Anwenden%>" />
</form>