summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMika Havela <mika.havela@gmail.com>2009-07-08 12:38:46 +0000
committerMika Havela <mika.havela@gmail.com>2009-07-08 12:38:46 +0000
commit8a4c15fed8bd5410ff4ad92953348a54af30a2b5 (patch)
tree78a73c1b52afef4f1d598f8f093a9a0bc4446d13
parented71ae19d09a7776f01427ef5032db140f5977f7 (diff)
downloadacf-rrdtool-8a4c15fed8bd5410ff4ad92953348a54af30a2b5.tar.bz2
acf-rrdtool-8a4c15fed8bd5410ff4ad92953348a54af30a2b5.tar.xz
List rrd-files and graph-configfiles in a config-page.
-rw-r--r--rrdtool-controller.lua14
-rw-r--r--rrdtool-listrrd-html.lsp4
-rw-r--r--rrdtool.menu3
-rw-r--r--rrdtool.roles4
4 files changed, 18 insertions, 7 deletions
diff --git a/rrdtool-controller.lua b/rrdtool-controller.lua
index 2ea79b0..ac0e1cb 100644
--- a/rrdtool-controller.lua
+++ b/rrdtool-controller.lua
@@ -25,7 +25,7 @@ function listrrd(self)
local configfiles = self.model.getrrdlist()
local config = {}
- return cfe({ type="list", value=configfiles.value, label="RoundRobinDatabase (rrd) files" })
+ return cfe({ type="list", value=configfiles.value, label="View/Edit RoundRobinDatabase (rrd) files" })
end
function createrrd(self)
@@ -49,3 +49,15 @@ end
function viewgraph(self)
return self.model.view_graph(self, self.clientdata.group, self.clientdata.id)
end
+
+function listgraphcfg(self)
+ local configfiles = self.model.getrrdlist()
+ local config = {}
+
+ return cfe({ type="list", value=configfiles.value, label="View/Edit graph files" })
+end
+
+function config(self)
+ return nil
+end
+
diff --git a/rrdtool-listrrd-html.lsp b/rrdtool-listrrd-html.lsp
index 6883258..9f1fbaa 100644
--- a/rrdtool-listrrd-html.lsp
+++ b/rrdtool-listrrd-html.lsp
@@ -21,8 +21,7 @@ function javascript_confirm_demo(formID,filename) {
}
</script>
-<h1>Databases</h1>
-<h2>Edit/View existing DB's</h2>
+<h2><%= form.label %></h2>
<form id="confirmDisplay" action="#" onsubmit="return false"></form>
@@ -69,3 +68,4 @@ function javascript_confirm_demo(formID,filename) {
newfileform.action = page_info.script .. page_info.prefix .. page_info.controller .. "/newfile"
displayform(newfileform)
end %>
+
diff --git a/rrdtool.menu b/rrdtool.menu
index 2cef415..49aa53c 100644
--- a/rrdtool.menu
+++ b/rrdtool.menu
@@ -1,6 +1,5 @@
#CAT GROUP/DESC TAB ACTION
Applications 70rrdtool Status welcome
-#Applications 70rrdtool Config config
-Applications 70rrdtool Databases listrrd
+Applications 70rrdtool Config config
Applications 70rrdtool Expert expert
diff --git a/rrdtool.roles b/rrdtool.roles
index a7de826..8423772 100644
--- a/rrdtool.roles
+++ b/rrdtool.roles
@@ -1,4 +1,4 @@
-USER=rrdtool:status,rrdtool:welcome,rrdtool:startstop,rrdtool:rrdinfo,rrdtool:listgraphs,rrdtool:viewgraph
+USER=rrdtool:status,rrdtool:welcome,rrdtool:startstop,rrdtool:rrdinfo,rrdtool:listgraphs,rrdtool:viewgraph,rrdtool:listgraphcfg,rrdtool:configure
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
+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:configure