Module:Navbox: Difference between revisions
add back new code, commented out for later fixing |
refactor row contents from array to table of key-value pairs (again) |
||
| Line 2: | Line 2: | ||
local getArgs = require("Module:Arguments").getArgs | local getArgs = require("Module:Arguments").getArgs | ||
local navbar = require("Module:Navbar")._navbar | local navbar = require("Module:Navbar")._navbar | ||
local tiu = require("Module:Template input utils") | |||
local yesno = require("Module:Yesno") | local yesno = require("Module:Yesno") | ||
| Line 17: | Line 18: | ||
-- to be refactored (currently) because they only need to be called a fixed | -- to be refactored (currently) because they only need to be called a fixed | ||
-- number of times. | -- number of times. | ||
function p.navbox_row(row_content, | function p.navbox_row(row_content, is_content_navbox) | ||
local is_navbox = | local is_navbox = is_navbox or false | ||
local header = row_content["Header"] | |||
local data = row_content["Data"] | |||
local row = {} | local row = {} | ||
if header and data then | |||
if | |||
-- Row is a header+data row | -- Row is a header+data row | ||
local header_style = '! style="white-space: nowrap; font-size: 0.9em; width: 5%; text-align: right; background-color: #eaecf0; padding: 0.25em 0.5em; border: 1px solid white;" |' | local header_style = '! style="white-space: nowrap; font-size: 0.9em; width: 5%; text-align: right; background-color: #eaecf0; padding: 0.25em 0.5em; border: 1px solid white;" |' | ||
local data_style = | local data_style = is_content_navbox | ||
and '| style="padding: 0;" |' -- For nested navboxes | and '| style="padding: 0;" |' -- For nested navboxes | ||
or '| style="font-size: 0.9em; padding: 0.25em 0.5em;" | ' -- For normal content | or '| style="font-size: 0.9em; padding: 0.25em 0.5em;" | ' -- For normal content | ||
table.insert(row, header_style .. | table.insert(row, "|-") | ||
table.insert(row, data_style .. | table.insert(row, header_style .. header) | ||
table.insert(row, data_style .. data) | |||
elseif data and not header then | |||
-- Row is a headerless data row... | |||
local data_style = is_content_navbox | |||
and '| style="padding: 0;" colspan="2" | ' -- For nested navboxes | |||
or '| style="font-size: 0.9em; padding: 0.25em 0.5em;" colspan="2" | ' -- For normal content | |||
table.insert(row, "|-") | |||
table.insert(row, data_style .. data) | |||
elseif header and not data then | |||
-- Row is a dataless header row... | |||
local data_style = is_content_navbox | |||
and '| style="padding: 0;" colspan="2" | ' -- For nested navboxes | |||
or '| style="font-size: 0.9em; padding: 0.25em 0.5em;" colspan="2" | ' -- For normal content | |||
table.insert(row, "|-") | |||
table.insert(row, data_style .. header) | |||
end | end | ||
return table.concat(row, "\n") | return table.concat(row, "\n") | ||
| Line 226: | Line 200: | ||
local args = getArgs(frame) | local args = getArgs(frame) | ||
-- Preprocess | -- Preprocess bools for rows that have either a header or data. | ||
-- | -- Absence of data defaults to false. | ||
local is_data_navbox = {} | local is_data_navbox = {} | ||
for i = 1, 30 do | for i = 1, 30 do | ||
local header = args["Header " .. i] | local header = args["Header " .. i] | ||
local data = args["Data " .. i] | local data = args["Data " .. i] | ||
local | local key = string.format("Is Data %d Navbox", i) | ||
local row_contains_entry = header and data | |||
if header or data then | |||
if | table.insert(is_data_navbox, args[key] or false) | ||
table.insert( | |||
end | end | ||
args[key] = nil | |||
args[ | |||
end | end | ||
args["Is Data Navbox"] = is_data_navbox | |||
-- Preprocess individual entries for headers and data | |||
local rows = tiu.header_data_pairs_to_table(args, 30) | |||
args["Rows"] = rows | args["Rows"] = rows | ||
local result = p._navbox(args) | local result = p._navbox(args) | ||
| Line 273: | Line 230: | ||
return result | return result | ||
end | |||
function p.tester() | |||
local row_content = { ["Header"] = "AAA" } | |||
return p.navbox_row(row_content, false) | |||
end | end | ||
return p | return p | ||