diff options
author | Mika Havela <mika.havela@gmail.com> | 2009-07-08 15:14:58 +0000 |
---|---|---|
committer | Mika Havela <mika.havela@gmail.com> | 2009-07-08 15:14:58 +0000 |
commit | 0b06a9d18889bf7fcca47379a5c0ec986e29ca3d (patch) | |
tree | 7702543d445f7c86ca341b2c97151b82a5b98034 | |
parent | 4fd29b69a10f27c6a48e5bba9d55a10241e6eb5c (diff) | |
download | acf-rrdtool-0b06a9d18889bf7fcca47379a5c0ec986e29ca3d.tar.bz2 acf-rrdtool-0b06a9d18889bf7fcca47379a5c0ec986e29ca3d.tar.xz |
Show graph-image in popup window
-rw-r--r-- | rrdtool-controller.lua | 1 | ||||
-rw-r--r-- | rrdtool-listgraphs-html.lsp | 19 | ||||
-rw-r--r-- | rrdtool-model.lua | 15 | ||||
-rw-r--r-- | rrdtool-viewgraph-html.lsp | 2 |
4 files changed, 25 insertions, 12 deletions
diff --git a/rrdtool-controller.lua b/rrdtool-controller.lua index 100cd9c..d325abe 100644 --- a/rrdtool-controller.lua +++ b/rrdtool-controller.lua @@ -47,6 +47,7 @@ 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 14e97e7..3776f54 100644 --- a/rrdtool-listgraphs-html.lsp +++ b/rrdtool-listgraphs-html.lsp @@ -10,6 +10,23 @@ io.write("</span>") --]] %> +<SCRIPT TYPE="text/javascript"> +<!-- +function popup(mylink, windowname) +{ +if (! window.focus)return true; +var href; +if (typeof(mylink) == 'string') + href=mylink; +else + href=mylink.href; +window.open(href, windowname, 'width=800,height=600,scrollbars=no,resizable=yes'); +return false; +} +//--> +</SCRIPT> + + <% icon="/skins/static/tango/16x16/apps/utilities-system-monitor.png" %> <H1>Graphs</H1> @@ -19,7 +36,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 %>"><IMG SRC='<%= icon %>' width='16' height='16'> <% io.write(graph.label or "Unknown") %></A></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> <DD><% io.write(graph.descr or "") %></DD> </DL> <% end %> diff --git a/rrdtool-model.lua b/rrdtool-model.lua index 834cae3..fa124b7 100644 --- a/rrdtool-model.lua +++ b/rrdtool-model.lua @@ -204,21 +204,16 @@ function view_graph(self, graph_grp, graph_id) } local graphs = list_graphs() - local settings = graphs[tostring(graph_grp)]["value"][tonumber(self.clientdata.id)] - local filename = "/"..tostring(graph_grp).."_"..tostring(graph_id) .. + local settings = graphs[tostring(graph_grp)][tonumber(self.clientdata.id)] + local filename = "/".. string.lower(tostring(graph_grp)).."_"..tostring(graph_id) .. (settings.filenameextention or ".png") - settings.value = tostring(filename) + settings.output = tostring(filename) --TODO: Loop the defaultsettings and put it in the settings table if there is missing some information local cmd = "/usr/bin/rrdtool graph /usr/share/acf/www" .. tostring(filename) .. " " - for k,v in pairs(settings.option) do - if (v) and (#v > 0) then - cmd = cmd .. "--".. format.escapespecialcharacters(k) .. " " .. - format.escapespecialcharacters(v) .. " " - end - end - cmd = cmd .. tostring(settings.variables) + + cmd = cmd .. tostring(settings.value) settings.cmd_query = cmd local f = io.popen( tostring(cmd) .. " 2>&1" ) settings.cmd_result = f:read("*a") or "" diff --git a/rrdtool-viewgraph-html.lsp b/rrdtool-viewgraph-html.lsp index 755f3c5..ecc2702 100644 --- a/rrdtool-viewgraph-html.lsp +++ b/rrdtool-viewgraph-html.lsp @@ -10,5 +10,5 @@ io.write("</span>") --]] %> <PRE><%= data.descr %></PRE> -<IMG SRC='<%= data.value %>' width='<%= data.graph.width or data.option.width %>' height='<%= data.graph.height or data.option.height %>'> +<IMG SRC='<%= data.output %>' width='<%= data.graph.width or data.option.width %>' height='<%= data.graph.height or data.option.height %>'> |