summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2012-11-26 00:49:21 +0000
committerTed Trask <ttrask01@yahoo.com>2012-11-26 00:49:21 +0000
commit0b761f9b48c384f90124e6105519383eef2e9686 (patch)
treeb72bf11dae32315863b8ee3fc8d03c11afa9a2bf
parent15286146e7a37e94922ee5f2b3243a67fb6bd69b (diff)
downloadacf-rrdtool-0b761f9b48c384f90124e6105519383eef2e9686.tar.bz2
acf-rrdtool-0b761f9b48c384f90124e6105519383eef2e9686.tar.xz
Removed startstop and welcome actions, cleaned up status, and removed popup viewtype
-rw-r--r--rrdtool-controller.lua5
-rw-r--r--rrdtool-listgraphs-html.lsp6
-rw-r--r--rrdtool-model.lua21
l---------[-rw-r--r--]rrdtool-status-html.lsp17
-rw-r--r--rrdtool-viewgraph-popup.lsp12
-rw-r--r--rrdtool-welcome-html.lsp7
-rw-r--r--rrdtool.menu2
-rw-r--r--rrdtool.roles4
8 files changed, 21 insertions, 53 deletions
diff --git a/rrdtool-controller.lua b/rrdtool-controller.lua
index 3975e54..740cada 100644
--- a/rrdtool-controller.lua
+++ b/rrdtool-controller.lua
@@ -10,10 +10,6 @@ function config(self)
return self.handle_form(self, self.model.read_config, self.model.update_config, self.clientdata, "Save", "Edit Config", "Configuration Saved")
end
-function startstop(self)
- return self.handle_form(self, self.model.get_startstop, self.model.startstop_service, self.clientdata)
-end
-
function expert(self)
return self.handle_form(self, self.model.getconfigfile, self.model.setconfigfile, self.clientdata, "Save", "Edit Config", "Configuration Saved")
end
@@ -44,7 +40,6 @@ function listgraphs(self)
end
function viewgraph(self)
- self.conf.viewtype = "popup"
return self.model.view_graph(self, self.clientdata.group, self.clientdata.id)
end
diff --git a/rrdtool-listgraphs-html.lsp b/rrdtool-listgraphs-html.lsp
index 00dcb64..f45c2d1 100644
--- a/rrdtool-listgraphs-html.lsp
+++ b/rrdtool-listgraphs-html.lsp
@@ -19,6 +19,10 @@ return false;
</SCRIPT>
+<% if viewlibrary and viewlibrary.dispatch_component then
+ viewlibrary.dispatch_component("status")
+end %>
+
<% icon=html.html_escape(page_info.wwwprefix..page_info.staticdir) .. "/tango/16x16/apps/utilities-system-monitor.png" %>
<H1>Graphs</H1>
@@ -28,7 +32,7 @@ for grp,v in pairs(data) do
<H2><% io.write(grp) %></H2>
<% for k,graph in pairs(v) do %>
<DL><DT>
- <A HREF="viewgraph?group=<%= grp %>&id=<%= k %>" onClick="return popup(this,'notes')"><IMG SRC='<%= icon %>' width='16' height='16'> <% io.write(graph.label or "Unknown") %></A></DT>
+ <A HREF="viewgraph?skinned=false&group=<%= grp %>&id=<%= k %>" onClick="return popup(this,'notes')"><IMG SRC='<%= icon %>' width='16' height='16'> <% io.write(graph.label or "Unknown") %></A></DT>
<DD><% io.write(graph.descr or "") %></DD>
</DL>
<% end %>
diff --git a/rrdtool-model.lua b/rrdtool-model.lua
index 259bfa9..2080bfc 100644
--- a/rrdtool-model.lua
+++ b/rrdtool-model.lua
@@ -7,6 +7,7 @@ fs = require("acf.fs")
format = require("acf.format")
date = require("acf.date")
validator = require("acf.validator")
+processinfo = require("acf.processinfo")
-- Set variables
local configfile = "/etc/rrdtool/acf-rrdtool.conf"
@@ -64,16 +65,18 @@ end
-- ################################################################################
-- PUBLIC FUNCTIONS
-function get_startstop(self, clientdata)
- return modelfunctions.get_startstop(processname)
-end
-
-function startstop_service(self, startstop, action)
- return modelfunctions.startstop_service(startstop, action)
-end
-
function getstatus()
- return modelfunctions.getstatus(processname, packagename, header .. " status")
+ local status = {}
+
+ local value, errtxt = processinfo.package_version(packagename)
+ status.version = cfe({
+ label="Program version",
+ value=value,
+ errtxt=errtxt,
+ name=packagename
+ })
+
+ return cfe({ type="group", value=status, label=header .. " status" })
end
function getconfigfile()
diff --git a/rrdtool-status-html.lsp b/rrdtool-status-html.lsp
index 05141bd..b2f8480 100644..120000
--- a/rrdtool-status-html.lsp
+++ b/rrdtool-status-html.lsp
@@ -1,16 +1 @@
-<% local data, viewlibrary, page_info, session = ...
-require("htmlviewfunctions")
-%>
-
-<% htmlviewfunctions.displaycommandresults({"install","edit"}, session) %>
-
-<H1>System Info</H1>
-<DL>
-<%
-htmlviewfunctions.displayitem(data.value.version)
-%>
-</DL>
-
-<% if viewlibrary and viewlibrary.dispatch_component then
- viewlibrary.dispatch_component("listgraphs")
-end %>
+../status-html.lsp \ No newline at end of file
diff --git a/rrdtool-viewgraph-popup.lsp b/rrdtool-viewgraph-popup.lsp
deleted file mode 100644
index ac47a6d..0000000
--- a/rrdtool-viewgraph-popup.lsp
+++ /dev/null
@@ -1,12 +0,0 @@
-<% local data, viewlibrary, page_info, session = ...
-%>
-
-<% if (data.graph.width) then %>
-<IMG SRC='<%= data.output %>' width='<%= data.graph.width or data.option.width %>' height='<%= data.graph.height or data.option.height %>'>
-<% else %>
-<H1>No valid output available!</H1>
-<P>Please check if your syntax is right.<BR>
-Read http://oss.oetiker.ch/rrdtool/doc/rrdgraph.en.html for help.</P>
-<HR>
-<P><% io.write(tostring(data.value)) %></P>
-<% end %>
diff --git a/rrdtool-welcome-html.lsp b/rrdtool-welcome-html.lsp
deleted file mode 100644
index 7cf7f79..0000000
--- a/rrdtool-welcome-html.lsp
+++ /dev/null
@@ -1,7 +0,0 @@
-<% local data, viewlibrary, page_info, session = ...
-%>
-
-<% if viewlibrary and viewlibrary.dispatch_component then
- viewlibrary.dispatch_component("status")
-end %>
-
diff --git a/rrdtool.menu b/rrdtool.menu
index 49aa53c..bc3432d 100644
--- a/rrdtool.menu
+++ b/rrdtool.menu
@@ -1,5 +1,5 @@
#CAT GROUP/DESC TAB ACTION
-Applications 70rrdtool Status welcome
+Applications 70rrdtool Graphs listgraphs
Applications 70rrdtool Config config
Applications 70rrdtool Expert expert
diff --git a/rrdtool.roles b/rrdtool.roles
index ad480a1..6c1fef3 100644
--- a/rrdtool.roles
+++ b/rrdtool.roles
@@ -1,4 +1,4 @@
-USER=rrdtool:status,rrdtool:welcome,rrdtool:startstop,rrdtool:rrdinfo,rrdtool:listgraphs,rrdtool:viewgraph,rrdtool:listgraphcfg
+USER=rrdtool:status,rrdtool:rrdinfo,rrdtool:listgraphs,rrdtool:viewgraph,rrdtool:listgraphcfg
EDITOR=rrdtool:config,rrdtool:listrrd
EXPERT=rrdtool:expert
-ADMIN=rrdtool:status,rrdtool:welcome,rrdtool:startstop,rrdtool:config,rrdtool:listrrd,rrdtool:expert,rrdtool:delete,rrdtool:createrrd,rrdtool:rrdinfo,rrdtool:listgraphs,rrdtool:viewgraph,rrdtool:listgraphcfg,rrdtool:editgraphcfg,rrdtool:newgraphcfg
+ADMIN=rrdtool:status,rrdtool:config,rrdtool:listrrd,rrdtool:expert,rrdtool:delete,rrdtool:createrrd,rrdtool:rrdinfo,rrdtool:listgraphs,rrdtool:viewgraph,rrdtool:listgraphcfg,rrdtool:editgraphcfg,rrdtool:newgraphcfg