Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* luci/statistics: move public pages to /admin/statistics/graph/

Browse source
This commit is contained in:
Jo-Philipp Wich 2008-06-03 20:04:20 +00:00
parent e7b45d71da
commit db3a4c5c97
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
View file

@ -58,9 +58,9 @@ function index()
_entry({"admin", "statistics", "network", "dns"}, cbi("luci_statistics/dns"), _i18n("dns"), 60) _entry({"admin", "statistics", "network", "dns"}, cbi("luci_statistics/dns"), _i18n("dns"), 60)
_entry({"admin", "statistics", "network", "wireless"}, cbi("luci_statistics/wireless"), _i18n("wireless"), 70) _entry({"admin", "statistics", "network", "wireless"}, cbi("luci_statistics/wireless"), _i18n("wireless"), 70)
-- public views -- output views
entry({"freifunk", "statistics"}, call("statistics_index"), "Statistiken", 80).i18n = "statistics" entry( { "admin", "statistics", "graph" }, call("statistics_index"), _i18n("graphs"), 80).i18n = "statistics"
local vars = luci.http.formvalues() local vars = luci.http.formvalues()
local span = vars.timespan or nil local span = vars.timespan or nil
@ -72,7 +72,7 @@ function index()
-- plugin menu entry -- plugin menu entry
entry( entry(
{ "freifunk", "statistics", plugin }, { "admin", "statistics", "graph", plugin },
call("statistics_render"), _i18n( plugin ), i call("statistics_render"), _i18n( plugin ), i
).query = { timespan = span } ).query = { timespan = span }
@ -81,7 +81,7 @@ function index()
for j, inst in ipairs(instances) do for j, inst in ipairs(instances) do
-- instance menu entry -- instance menu entry
entry( entry(
{ "freifunk", "statistics", plugin, inst }, { "admin", "statistics", "graph", plugin, inst },
call("statistics_render"), inst, j call("statistics_render"), inst, j
).query = { timespan = span } ).query = { timespan = span }
end end
@ -131,14 +131,14 @@ function statistics_render( tree )
require("luci.model.uci") require("luci.model.uci")
local vars = luci.http.formvalues() local vars = luci.http.formvalues()
local req = luci.dispatcher.request local req = luci.dispatcher.request
local uci = luci.model.uci.Session() local uci = luci.model.uci.Session()
local spans = luci.util.split( uci:get( "luci_statistics", "collectd_rrdtool", "RRATimespans" ), "%s+", nil, true ) local spans = luci.util.split( uci:get( "luci_statistics", "collectd_rrdtool", "RRATimespans" ), "%s+", nil, true )
local span = vars.timespan or uci:get( "luci_statistics", "rrdtool", "default_timespan" ) or spans[1] local span = vars.timespan or uci:get( "luci_statistics", "rrdtool", "default_timespan" ) or spans[1]
local graph = luci.statistics.rrdtool.Graph( luci.util.parse_units( span ) ) local graph = luci.statistics.rrdtool.Graph( luci.util.parse_units( span ) )
local plugin = req[3] local plugin = req[4]
local instances = { req[4] } local instances = { req[5] }
local images = { } local images = { }
-- no instance requested, find all instances -- no instance requested, find all instances
@ -155,7 +155,7 @@ function statistics_render( tree )
if i:len() == 0 then i = "-" end if i:len() == 0 then i = "-" end
luci.http.redirect( luci.dispatcher.build_url( luci.http.redirect( luci.dispatcher.build_url(
req[1], req[2], req[3], i req[1], req[2], req[3], req[4], i
) ) ) )
return return

1
applications/luci-statistics/luasrc/i18n/statistics.en
View file

@ -23,6 +23,7 @@ stat_systemplugins = "System plugins"
stat_networkplugins = "Network plugins" stat_networkplugins = "Network plugins"
stat_outputplugins = "Output plugins" stat_outputplugins = "Output plugins"
stat_showtimespan = "Display timespan »" stat_showtimespan = "Display timespan »"
stat_graphs = "Graphs"
-- --