vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-29 15:39:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix after rebase

Browse source
This commit is contained in:
emanuele-f 2017-01-11 20:40:29 +01:00
parent 6934bfdb0b
commit 0e7bdf503e
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scripts/lua/modules/lua_utils.lua
View file

@ -2586,7 +2586,8 @@ function makeResolutionButtons(fmt_to_data, ctrl_id, fmt, value, extra)
selected = string.sub(fmt, 1, 1)
end
html_lines[#html_lines+1] = [[<div class="btn-group ]] .. table.concat(extra.classes or {}, "") .. [[" id="]] .. ctrl_id .. [[" data-toggle="buttons" style="display:inline;">]]
local style = table.merge({display="flex"}, extra.style or {})
html_lines[#html_lines+1] = [[<div class="btn-group ]] .. table.concat(extra.classes or {}, "") .. [[" id="]] .. ctrl_id .. [[" data-toggle="buttons" style="]] .. table.tconcat(style, ":", "; ", ";") .. [[">]]
-- foreach character in format
string.gsub(fmt, ".", function(k)
@ -2615,7 +2616,7 @@ function makeResolutionButtons(fmt_to_data, ctrl_id, fmt, value, extra)
var _resol_inputs = [];
function resol_selector_get_input(an_input) {
return $(".form-group > input", $(an_input).parent().parent().parent().parent()).first();
return $("input", $(an_input).closest(".form-group")).last();
}
/* This function scales values wrt selected resolution */