From ecf0912ff51a14d36612a827c4ecf33c9b5f6947 Mon Sep 17 00:00:00 2001 From: Bart Van Der Meerssche Date: Wed, 20 Apr 2011 12:47:06 +0200 Subject: [PATCH] [luci] add syslog and sensor dash icons to the web interface --- .../luasrc/controller/mini/status.lua | 33 ++++++++++++++++++ .../admin-mini/luasrc/view/mini/dmesg.htm | 20 +++++++++++ .../admin-mini/luasrc/view/mini/syslog.htm | 20 +++++++++++ .../htdocs/luci-static/oxygen/dashboard.css | 8 +++++ .../luci-static/oxygen/icons/sensor.png | Bin 0 -> 4823 bytes .../luci-static/oxygen/icons/syslog.png | Bin 0 -> 4481 bytes .../luasrc/view/themes/oxygen/header.htm | 8 +++++ 7 files changed, 89 insertions(+) create mode 100644 mote/v2/openwrt/package/luci/modules/admin-mini/luasrc/controller/mini/status.lua create mode 100644 mote/v2/openwrt/package/luci/modules/admin-mini/luasrc/view/mini/dmesg.htm create mode 100644 mote/v2/openwrt/package/luci/modules/admin-mini/luasrc/view/mini/syslog.htm create mode 100644 mote/v2/openwrt/package/luci/themes/oxygen/htdocs/luci-static/oxygen/icons/sensor.png create mode 100644 mote/v2/openwrt/package/luci/themes/oxygen/htdocs/luci-static/oxygen/icons/syslog.png diff --git a/mote/v2/openwrt/package/luci/modules/admin-mini/luasrc/controller/mini/status.lua b/mote/v2/openwrt/package/luci/modules/admin-mini/luasrc/controller/mini/status.lua new file mode 100644 index 0000000..719a37b --- /dev/null +++ b/mote/v2/openwrt/package/luci/modules/admin-mini/luasrc/controller/mini/status.lua @@ -0,0 +1,33 @@ +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth + +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: status.lua 5118 2009-07-23 03:32:30Z jow $ +]]-- +module("luci.controller.mini.status", package.seeall) + +function index() + luci.i18n.loadc("admin-core") + local i18n = luci.i18n.translate + + entry({"syslog"}, call("action_syslog"), i18n("syslog", "System Log"), 5) + entry({"dmesg"}, call("action_dmesg"), i18n("dmesg", "Kernel Log"), 6) + +end + +function action_syslog() + local syslog = luci.sys.syslog() + luci.template.render("mini/syslog", {syslog=syslog}) +end + +function action_dmesg() + local dmesg = luci.sys.dmesg() + luci.template.render("mini/dmesg", {dmesg=dmesg}) +end diff --git a/mote/v2/openwrt/package/luci/modules/admin-mini/luasrc/view/mini/dmesg.htm b/mote/v2/openwrt/package/luci/modules/admin-mini/luasrc/view/mini/dmesg.htm new file mode 100644 index 0000000..4fa8673 --- /dev/null +++ b/mote/v2/openwrt/package/luci/modules/admin-mini/luasrc/view/mini/dmesg.htm @@ -0,0 +1,20 @@ +<%# +LuCI - Lua Configuration Interface +Copyright 2008 Steven Barth +Copyright 2008 Jo-Philipp Wich + +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: syslog.htm 3622 2008-10-23 16:05:55Z jow $ + +-%> +<%+header%> +

<%:dmesg%>

+
+ +
+<%+footer%> diff --git a/mote/v2/openwrt/package/luci/modules/admin-mini/luasrc/view/mini/syslog.htm b/mote/v2/openwrt/package/luci/modules/admin-mini/luasrc/view/mini/syslog.htm new file mode 100644 index 0000000..10b3ecd --- /dev/null +++ b/mote/v2/openwrt/package/luci/modules/admin-mini/luasrc/view/mini/syslog.htm @@ -0,0 +1,20 @@ +<%# +LuCI - Lua Configuration Interface +Copyright 2008 Steven Barth +Copyright 2008 Jo-Philipp Wich + +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: syslog.htm 3791 2008-11-16 22:45:10Z jow $ + +-%> +<%+header%> +

<%:syslog%>

+
+ +
+<%+footer%> diff --git a/mote/v2/openwrt/package/luci/themes/oxygen/htdocs/luci-static/oxygen/dashboard.css b/mote/v2/openwrt/package/luci/themes/oxygen/htdocs/luci-static/oxygen/dashboard.css index 184afe7..5aa9cb9 100644 --- a/mote/v2/openwrt/package/luci/themes/oxygen/htdocs/luci-static/oxygen/dashboard.css +++ b/mote/v2/openwrt/package/luci/themes/oxygen/htdocs/luci-static/oxygen/dashboard.css @@ -32,4 +32,12 @@ div.di_wifi a { background-image: url(icons/wifi.png); } +div.di_syslog a { + background-image: url(icons/syslog.png); +} + +div.di_sensor a { + background-image: url(icons/sensor.png); +} + } diff --git a/mote/v2/openwrt/package/luci/themes/oxygen/htdocs/luci-static/oxygen/icons/sensor.png b/mote/v2/openwrt/package/luci/themes/oxygen/htdocs/luci-static/oxygen/icons/sensor.png new file mode 100644 index 0000000000000000000000000000000000000000..8c004b76cfddc6670be441001c2107ed5b5fcfed GIT binary patch literal 4823 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 TR0Q~L00000NkvXXu0mjf8# literal 0 HcmV?d00001 diff --git a/mote/v2/openwrt/package/luci/themes/oxygen/luasrc/view/themes/oxygen/header.htm b/mote/v2/openwrt/package/luci/themes/oxygen/luasrc/view/themes/oxygen/header.htm index b6057fe..979723e 100644 --- a/mote/v2/openwrt/package/luci/themes/oxygen/luasrc/view/themes/oxygen/header.htm +++ b/mote/v2/openwrt/package/luci/themes/oxygen/luasrc/view/themes/oxygen/header.htm @@ -110,6 +110,10 @@ ucimenu("/" .. category .. "/uci/", tree.nodes[category].nodes["uci"], "changes"
+
+ Sensor +
+
Wifi
@@ -121,6 +125,10 @@ ucimenu("/" .. category .. "/uci/", tree.nodes[category].nodes["uci"], "changes"
System
+ +
+ Syslog +