Module:Navbox: Difference between revisions

Ganaram inukshuk (talk | contribs)
refactor row contents from array to table of key-value pairs
Tag: Reverted
Ganaram inukshuk (talk | contribs)
Undo revision 212910 by Ganaram inukshuk (talk) rollback for now
Tag: Undo
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 18: Line 17:
-- 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_data_navbox)
function p.navbox_row(row_content, is_navbox)
local is_data_navbox = is_navbox or false
local is_navbox = (is_navbox ~= nil and is_navbox or false)
local row = {}
local row = {}
table.insert(row, "|-")
table.insert(row, "|-")
local header = row_content["Header"]
if #row_content == 1 then
local data = row_content["Data"]
-- Row is a headerless row...
if is_data_navbox then
if is_navbox then
-- Row content contains a nested navbox...
-- ...and row content is a nested navbox
if header and data then
table.insert(row, '| style="padding: 0;" colspan="2" |')
-- ...and it's a header-data pair.
table.insert(row, row_content[1])
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))
else
table.insert(row, string.format('| style="font-size: 0.9em; padding: 0.25em 0.5em;" | ', data))
-- ... and row content is normal content (text and links)
elseif data and not header then
table.insert(row, '| style="font-size: 0.9em; padding: 0.25em 0.5em;" colspan="2" | ' .. row_content[1])
-- ...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
end
else
else
-- Row content is normal content (reglar text and/or links)...
-- Row is a header+data row
if header and data then
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;" |'
-- ...and it's a header-data pair
local data_style = is_navbox
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))
and '| style="padding: 0;" |' -- For nested navboxes
table.insert(row, string.format('| style="padding: 0;" | ', data))
or  '| style="font-size: 0.9em; padding: 0.25em 0.5em;" | ' -- For normal content
elseif data and not header then
 
-- ...and it's a headerless data row
table.insert(row, header_style .. row_content[1])
table.insert(row, '| style="padding: 0;" colspan="2" |' .. data)
table.insert(row, data_style .. row_content[2])
elseif header and not data then
-- ...and it's a dataless header row
end
end
end


Line 71: Line 60:
-- most cases, however.
-- most cases, however.
function p.navbox_title(title, is_collapsible, name)
function p.navbox_title(title, is_collapsible, name)
--local is_root_navbox = (is_root_navbox == nil and is_root_navbox or true) -- If not specified, default to TRUE; unused??
local is_root_navbox = (is_root_navbox == nil and is_root_navbox or true) -- If not specified, default to TRUE
local has_navbar = name ~= nil
local has_navbar = name ~= nil
local navbox_title = ''
local navbox_title = ''
Line 215: Line 204:
-- Headerless row
-- Headerless row
row = {}
row = {}
row["Data"] = data
table.insert(row, data)
elseif (header ~= nil and data == nil) then
elseif (header ~= nil and data == nil) then
-- Dataless row
-- Dataless row; permitted for placeholder purposes
row = {}
row = {}
row["Header"] = header
table.insert(row, header)
row["Data"] = ""
table.insert(row, "")
elseif (header ~= nil and data ~= nil) then
elseif (header ~= nil and data ~= nil) then
-- Row with header and data
-- Row with header and data
row = {}
row = {}
row["Header"] = header
table.insert(row, header)
row["Data"] = data
table.insert(row, data)
end
end
if row ~= nil then
if row ~= nil then
Line 249: Line 238:
return result
return result
end
function p.tester()
local args = {
["Data 1"] = "aaa",
["Header 2"] = "BBB",
["Data 2"] = "bbb",
["Header 3"] = "CCC",
}
args["Rows"] = tiu.header_data_pairs_to_table(args, 30)
args["Is Data Navbox"] = { false, false, false }
return p._navbox(args)
end
end


return p
return p