Module:Navbox: Difference between revisions

Ganaram inukshuk (talk | contribs)
add back new code, commented out for later fixing
Ganaram inukshuk (talk | contribs)
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, is_navbox)
function p.navbox_row(row_content, is_content_navbox)
local is_navbox = (is_navbox ~= nil and is_navbox or false)
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
table.insert(row, "|-")
if #row_content == 1 then
-- Row is a headerless row...
if is_navbox then
-- ...and row content is a nested navbox
table.insert(row, '| style="padding: 0;" colspan="2" |')
table.insert(row, row_content[1])
else
-- ... and row content is normal content (text and links)
table.insert(row, '| style="font-size: 0.9em; padding: 0.25em 0.5em;" colspan="2" | ' .. row_content[1])
end
else
-- 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 = is_navbox
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 .. row_content[1])
table.insert(row, "|-")
table.insert(row, data_style .. row_content[2])
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
-- New code, commented out for later bugfixing
--[[
table.insert(row, "|-")
local header = row_content["Header"]
local data = row_content["Data"]
if is_data_navbox then
-- Row content contains a nested navbox...
if header and data then
-- ...and it's a header-data pair.
table.insert(row, string.format('! 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;" | %s', header))
table.insert(row, string.format('| style="font-size: 0.9em; padding: 0.25em 0.5em;" | ', data))
elseif data and not header then
-- ...and it's a headerless data row.
table.insert(row, string.format('| style="font-size: 0.9em; padding: 0.25em 0.5em;" colspan="2" | %s', data))
elseif header and not data then
-- ...and it's a dataless header row; whole row becomes a header
-- that can be used as a separator.
end
else
-- Row content is normal content (reglar text and/or links)...
if header and data then
-- ...and it's a header-data pair
table.insert(row, string.format('! 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;" | %s', header))
table.insert(row, string.format('| style="padding: 0;" | ', data))
elseif data and not header then
-- ...and it's a headerless data row
table.insert(row, '| style="padding: 0;" colspan="2" |' .. data)
elseif header and not data then
-- ...and it's a dataless header row
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 individual entries for, headers, data, and is-row-child into
-- Preprocess bools for rows that have either a header or data.
-- one single table.
-- Absence of data defaults to false.
local rows = {}
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 is_navbox = args["Is Data " .. i .. " Navbox"] ~= nil and args["Is Data " .. i .. " Navbox"] or false
local key = string.format("Is Data %d Navbox", i)
local row_contains_entry = header and data
local row = nil
if header or data then
if (header == nil and data ~= nil) then
table.insert(is_data_navbox, args[key] or false)
-- Headerless row
row = {}
table.insert(row, data)
elseif (header ~= nil and data == nil) then
-- Dataless row; permitted for placeholder purposes
row = {}
table.insert(row, header)
table.insert(row, "")
elseif (header ~= nil and data ~= nil) then
-- Row with header and data
row = {}
table.insert(row, header)
table.insert(row, data)
end
end
if row ~= nil then
 
table.insert(rows, row)
args[key] = nil
table.insert(is_data_navbox, is_navbox)
end
-- Remove original entries as cleanup
args["Header " .. i] = nil
args["Data "  .. i] = nil
args["Is Data " .. i .. " Navbox"] = nil
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
args["Is Data Navbox"] = is_data_navbox
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