diff options
author | Mika Havela <mika.havela@gmail.com> | 2009-07-09 15:16:49 +0000 |
---|---|---|
committer | Mika Havela <mika.havela@gmail.com> | 2009-07-09 15:16:49 +0000 |
commit | 7d40932c23e7b5d67c2418a6bad49505da266228 (patch) | |
tree | d0006c0cfe09f0f5a882a22dfada0db914d11c09 | |
parent | ba16ab7316d239aff825478c22511bfc6d5ffa47 (diff) | |
download | acf-rrdtool-7d40932c23e7b5d67c2418a6bad49505da266228.tar.bz2 acf-rrdtool-7d40932c23e7b5d67c2418a6bad49505da266228.tar.xz |
Move the 'rrdtool info' output to top of config-view
Put back 'redir' option when you edited a graphcfgfile (now that it works again)
-rw-r--r-- | rrdtool-config-html.lsp | 2 | ||||
-rw-r--r-- | rrdtool-listgraphcfg-html.lsp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/rrdtool-config-html.lsp b/rrdtool-config-html.lsp index d69a265..8779545 100644 --- a/rrdtool-config-html.lsp +++ b/rrdtool-config-html.lsp @@ -2,7 +2,7 @@ require("viewfunctions") %> -<% displaycommandresults({"install","edit"}, session) %> +<% displaycommandresults({"install","editgraphcfg"}, session) %> <% displaycommandresults({"delete", "rrdinfo"}, session) %> <H1>Configure</H1> diff --git a/rrdtool-listgraphcfg-html.lsp b/rrdtool-listgraphcfg-html.lsp index aed86e0..9c1d944 100644 --- a/rrdtool-listgraphcfg-html.lsp +++ b/rrdtool-listgraphcfg-html.lsp @@ -39,7 +39,7 @@ function javascript_confirm_graph(formID,filename) { <A STYLE="cursor: pointer;" onclick="javascript_confirm_graph('confirmDisplay','<% io.write(file.value.filename.value) %>')">Delete</A> <% end %> <% - if session.permissions[page_info.controller].editgraphcfg then io.write(html.link{value = "editgraphcfg?filename=" .. file.value.filename.value, label="Edit " }) end + if session.permissions[page_info.controller].editgraphcfg then io.write(html.link{value = "editgraphcfg?filename=" .. file.value.filename.value.."&redir="..page_info.orig_action, label="Edit " }) end %> </TD> <TD style="padding-right:20px;white-space:nowrap;text-align:right;"><%= html.html_escape(file.value.filesize.value) %></TD> |