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)
m minor renaming
 
(17 intermediate revisions by the same user not shown)
Line 7: Line 7:
local p = {}
local p = {}


-- TODO (low priority): add an option for a dataless header row, to mirror the
-- TODO (medium priority): add/use navbox/styles.css
-- option of having a headerless data row. Requires changing row content from
-- a regular array to an associative array.


-- TODO (medium priority): nest and refactor helper functions
-- TODO (medium priority): nest and refactor helper functions
Line 18: Line 16:
-- 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_content_navbox)
local is_data_navbox = is_navbox or false
local is_navbox = is_navbox or false
local row = {}
table.insert(row, "|-")
local header = row_content["Header"]
local header = row_content["Header"]
local data = row_content["Data"]
local data = row_content["Data"]
if is_data_navbox then
-- Row content contains a nested navbox...
local row = {}
if header and data then
if header and data then
-- ...and it's a header-data pair.
-- Row is a header+data row
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))
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;" |'
table.insert(row, string.format('| style="font-size: 0.9em; padding: 0.25em 0.5em;" | ', data))
local data_style = is_content_navbox
elseif data and not header then
and '| style="padding: 0;" |\n' -- For nested navboxes; endline required for nested navboxes to work properly
-- ...and it's a headerless data row.
or  '| style="font-size: 0.9em; padding: 0.25em 0.5em;" |' -- For normal content; endline not needed as adding it makes rows too thick
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
table.insert(row, "|-")
-- ...and it's a dataless header row; whole row becomes a header
table.insert(row, header_style .. header)
-- that can be used as a separator.
table.insert(row, data_style .. data)
elseif data and not header then
end
-- Row is a headerless data row
else
local data_style = is_content_navbox
-- Row content is normal content (reglar text and/or links)...
and '| style="padding: 0; colspan="2" |\n' -- For nested navboxes
if header and data then
or  '| style="font-size: 0.9em; padding: 0.25em 0.5em;" colspan="2" |' -- For normal content
-- ...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, "|-")
table.insert(row, string.format('| style="padding: 0;" | ', data))
table.insert(row, data_style .. data)
elseif data and not header then
elseif header and not data then
-- ...and it's a headerless data row
-- Row is a dataless header row
table.insert(row, '| style="padding: 0;" colspan="2" |' .. data)
local data_style = is_content_navbox
elseif header and not data then
and '! style="padding: 0;" colspan="2" |\n' -- For nested navboxes; in case nav elements are ever added here, such as numlinks
-- ...and it's a dataless header row
or  '! style="white-space: nowrap; font-size: 0.9em; width: 5%; background-color: #eaecf0; padding: 0.25em 0.5em; border: 1px solid white;" colspan="2" |'
end
table.insert(row, "|-")
table.insert(row, data_style .. header)
end
end


Line 71: Line 67:
-- 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 106: Line 102:
-- Navbox to be called by other modules; also called by wrapper function
-- Navbox to be called by other modules; also called by wrapper function
function p._navbox(args)
function p._navbox(args)
local title          = args["Title"]
local title          = args["Title"] or "Navbox Title"
local name            = args["name"]
local name            = args["name"]
local rows            = args["Rows"]
local rows            = args["Rows"]
Line 202: Line 198:
local args = getArgs(frame)
local args = getArgs(frame)
-- Preprocess individual entries for, headers, data, and is-row-child into
-- Preprocess bools for rows that indicate whether that row is a nested
-- one single table.
-- navbox. A row is considered valid if it has either a header or data. If
local rows = {}
-- a bool exists but not its header or data, it's skipped. If a valid row
-- exists but not its bool, it 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 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 = 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 = {}
row["Data"] = data
elseif (header ~= nil and data == nil) then
-- Dataless row
row = {}
row["Header"] = header
row["Data"] = ""
elseif (header ~= nil and data ~= nil) then
-- Row with header and data
row = {}
row["Header"] = header
row["Data"] = 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.numbered_header_data_args_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 248: Line 228:
end
end
return result
return frame:preprocess(result)
end
end


function p.tester()
function p.tester()
local args = {
local row_content = { ["Header"] = "AAA" }
["Data 1"] = "aaa",
return p.navbox_row(row_content, false)
["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