Changes

3,270 bytes added ,  21:39, 7 January 2022
remove titlegroup per templatestyles section on talk page
Line 1: Line 1: −
--
  −
-- This module implements {{Navbox}}
  −
--
  −
   
local p = {}
 
local p = {}
   
local navbar = require('Module:Navbar')._navbar
 
local navbar = require('Module:Navbar')._navbar
 +
local cfg = mw.loadData('Module:Navbox/configuration')
 
local getArgs -- lazily initialized
 
local getArgs -- lazily initialized
   
local args
 
local args
local border
+
local format = string.format
local listnums
  −
local ODD_EVEN_MARKER = '\127_ODDEVEN_\127'
  −
local RESTART_MARKER = '\127_ODDEVEN0_\127'
  −
local REGEX_MARKER = '\127_ODDEVEN(%d?)_\127'
     −
local function striped(wikitext)
+
local function striped(wikitext, border)
 
-- Return wikitext with markers replaced for odd/even striping.
 
-- Return wikitext with markers replaced for odd/even striping.
 
-- Child (subgroup) navboxes are flagged with a category that is removed
 
-- Child (subgroup) navboxes are flagged with a category that is removed
 
-- by parent navboxes. The result is that the category shows all pages
 
-- by parent navboxes. The result is that the category shows all pages
 
-- where a child navbox is not contained in a parent navbox.
 
-- where a child navbox is not contained in a parent navbox.
local orphanCat = '[[Category:Navbox orphans]]'
+
local orphanCat = cfg.category.orphan
if border == 'subgroup' and args.orphan ~= 'yes' then
+
if border == cfg.keyword.border_subgroup and args[cfg.arg.orphan] ~= cfg.keyword.orphan_yes then
 
-- No change; striping occurs in outermost navbox.
 
-- No change; striping occurs in outermost navbox.
 
return wikitext .. orphanCat
 
return wikitext .. orphanCat
 
end
 
end
local first, second = 'odd', 'even'
+
local first, second = cfg.class.navbox_odd_part, cfg.class.navbox_even_part
if args.evenodd then
+
if args[cfg.arg.evenodd] then
if args.evenodd == 'swap' then
+
if args[cfg.arg.evenodd] == cfg.keyword.evenodd_swap then
 
first, second = second, first
 
first, second = second, first
 
else
 
else
first = args.evenodd
+
first = args[cfg.arg.evenodd]
 
second = first
 
second = first
 
end
 
end
Line 53: Line 44:  
end
 
end
 
local regex = orphanCat:gsub('([%[%]])', '%%%1')
 
local regex = orphanCat:gsub('([%[%]])', '%%%1')
return (wikitext:gsub(regex, ''):gsub(REGEX_MARKER, changer)) -- () omits gsub count
+
return (wikitext:gsub(regex, ''):gsub(cfg.marker.regex, changer)) -- () omits gsub count
 
end
 
end
   Line 62: Line 53:  
return '\n' .. item ..'\n'
 
return '\n' .. item ..'\n'
 
end
 
end
if nowrapitems == 'yes' then
+
if nowrapitems == cfg.keyword.nowrapitems_yes then
 
local lines = {}
 
local lines = {}
 
for line in (item .. '\n'):gmatch('([^\n]*)\n') do
 
for line in (item .. '\n'):gmatch('([^\n]*)\n') do
 
local prefix, content = line:match('^([*:;#]+)%s*(.*)')
 
local prefix, content = line:match('^([*:;#]+)%s*(.*)')
if prefix and not content:match('^<span class="nowrap">') then
+
if prefix and not content:match(cfg.pattern.nowrap) then
line = prefix .. '<span class="nowrap">' .. content .. '</span>'
+
line = format(cfg.nowrap_item, prefix, content)
 
end
 
end
 
table.insert(lines, line)
 
table.insert(lines, line)
Line 77: Line 68:  
end
 
end
 
return item
 
return item
 +
end
 +
 +
-- we will want this later when we want to add tstyles for hlist/plainlist
 +
local function has_navbar()
 +
return args[cfg.arg.navbar] ~= cfg.keyword.navbar_off
 +
and args[cfg.arg.navbar] ~= cfg.keyword.navbar_plain
 +
and (
 +
args[cfg.arg.name]
 +
or mw.getCurrentFrame():getParent():getTitle():gsub(cfg.pattern.sandbox, '')
 +
~= cfg.pattern.navbox
 +
)
 
end
 
end
    
local function renderNavBar(titleCell)
 
local function renderNavBar(titleCell)
 
+
if has_navbar() then
if args.navbar ~= 'off' and args.navbar ~= 'plain' and not (not args.name and mw.getCurrentFrame():getParent():getTitle():gsub('/sandbox$', '') == 'Template:Navbox') then
   
titleCell:wikitext(navbar{
 
titleCell:wikitext(navbar{
args.name,
+
[cfg.navbar.name] = args[cfg.arg.name],
mini = 1,
+
[cfg.navbar.mini] = 1,
fontstyle = (args.basestyle or '') .. ';' .. (args.titlestyle or '') .. ';background:none transparent;border:none;box-shadow:none;padding:0;'
+
[cfg.navbar.fontstyle] = (args[cfg.arg.basestyle] or '') .. ';' ..
 +
(args[cfg.arg.titlestyle] or '') ..
 +
';background:none transparent;border:none;box-shadow:none;padding:0;'
 
})
 
})
 
end
 
end
Line 91: Line 94:  
end
 
end
   −
--
  −
--  Title row
  −
--
   
local function renderTitleRow(tbl)
 
local function renderTitleRow(tbl)
if not args.title then return end
+
if not args[cfg.arg.title] then return end
    
local titleRow = tbl:tag('tr')
 
local titleRow = tbl:tag('tr')
  −
if args.titlegroup then
  −
titleRow
  −
:tag('th')
  −
:attr('scope', 'row')
  −
:addClass('navbox-group')
  −
:addClass(args.titlegroupclass)
  −
:cssText(args.basestyle)
  −
:cssText(args.groupstyle)
  −
:cssText(args.titlegroupstyle)
  −
:wikitext(args.titlegroup)
  −
end
      
local titleCell = titleRow:tag('th'):attr('scope', 'col')
 
local titleCell = titleRow:tag('th'):attr('scope', 'col')
  −
if args.titlegroup then
  −
titleCell
  −
:css('border-left', '2px solid #fdfdfd')
  −
:css('width', '100%')
  −
end
      
local titleColspan = 2
 
local titleColspan = 2
if args.imageleft then titleColspan = titleColspan + 1 end
+
if args[cfg.arg.imageleft] then titleColspan = titleColspan + 1 end
if args.image then titleColspan = titleColspan + 1 end
+
if args[cfg.arg.image] then titleColspan = titleColspan + 1 end
if args.titlegroup then titleColspan = titleColspan - 1 end
      
titleCell
 
titleCell
:cssText(args.basestyle)
+
:cssText(args[cfg.arg.basestyle])
:cssText(args.titlestyle)
+
:cssText(args[cfg.arg.titlestyle])
:addClass('navbox-title')
+
:addClass(cfg.class.navbox_title)
 
:attr('colspan', titleColspan)
 
:attr('colspan', titleColspan)
   Line 135: Line 116:  
:tag('div')
 
:tag('div')
 
-- id for aria-labelledby attribute
 
-- id for aria-labelledby attribute
:attr('id', mw.uri.anchorEncode(args.title))
+
:attr('id', mw.uri.anchorEncode(args[cfg.arg.title]))
:addClass(args.titleclass)
+
:addClass(args[cfg.arg.titleclass])
 
:css('font-size', '114%')
 
:css('font-size', '114%')
 
:css('margin', '0 4em')
 
:css('margin', '0 4em')
:wikitext(processItem(args.title))
+
:wikitext(processItem(args[cfg.arg.title]))
 
end
 
end
  −
--
  −
--  Above/Below rows
  −
--
      
local function getAboveBelowColspan()
 
local function getAboveBelowColspan()
 
local ret = 2
 
local ret = 2
if args.imageleft then ret = ret + 1 end
+
if args[cfg.arg.imageleft] then ret = ret + 1 end
if args.image then ret = ret + 1 end
+
if args[cfg.arg.image] then ret = ret + 1 end
 
return ret
 
return ret
 
end
 
end
    
local function renderAboveRow(tbl)
 
local function renderAboveRow(tbl)
if not args.above then return end
+
if not args[cfg.arg.above] then return end
    
tbl:tag('tr')
 
tbl:tag('tr')
 
:tag('td')
 
:tag('td')
:addClass('navbox-abovebelow')
+
:addClass(cfg.class.navbox_abovebelow)
:addClass(args.aboveclass)
+
:addClass(args[cfg.arg.aboveclass])
:cssText(args.basestyle)
+
:cssText(args[cfg.arg.basestyle])
:cssText(args.abovestyle)
+
:cssText(args[cfg.arg.abovestyle])
 
:attr('colspan', getAboveBelowColspan())
 
:attr('colspan', getAboveBelowColspan())
 
:tag('div')
 
:tag('div')
 
-- id for aria-labelledby attribute, if no title
 
-- id for aria-labelledby attribute, if no title
:attr('id', args.title and nil or mw.uri.anchorEncode(args.above))
+
:attr('id', args[cfg.arg.title] and nil or mw.uri.anchorEncode(args[cfg.arg.above]))
:wikitext(processItem(args.above, args.nowrapitems))
+
:wikitext(processItem(args[cfg.arg.above], args[cfg.arg.nowrapitems]))
 
end
 
end
    
local function renderBelowRow(tbl)
 
local function renderBelowRow(tbl)
if not args.below then return end
+
if not args[cfg.arg.below] then return end
    
tbl:tag('tr')
 
tbl:tag('tr')
 
:tag('td')
 
:tag('td')
:addClass('navbox-abovebelow')
+
:addClass(cfg.class.navbox_abovebelow)
:addClass(args.belowclass)
+
:addClass(args[cfg.arg.belowclass])
:cssText(args.basestyle)
+
:cssText(args[cfg.arg.basestyle])
:cssText(args.belowstyle)
+
:cssText(args[cfg.arg.belowstyle])
 
:attr('colspan', getAboveBelowColspan())
 
:attr('colspan', getAboveBelowColspan())
 
:tag('div')
 
:tag('div')
:wikitext(processItem(args.below, args.nowrapitems))
+
:wikitext(processItem(args[cfg.arg.below], args[cfg.arg.nowrapitems]))
 
end
 
end
   −
--
+
local function renderListRow(tbl, index, listnum, listnums_size)
--  List rows
  −
--
  −
local function renderListRow(tbl, index, listnum)
   
local row = tbl:tag('tr')
 
local row = tbl:tag('tr')
   −
if index == 1 and args.imageleft then
+
if index == 1 and args[cfg.arg.imageleft] then
 
row
 
row
 
:tag('td')
 
:tag('td')
:addClass('noviewer')
+
:addClass(cfg.class.noviewer)
:addClass('navbox-image')
+
:addClass(cfg.class.navbox_image)
:addClass(args.imageclass)
+
:addClass(args[cfg.arg.imageclass])
 
:css('width', '1px')              -- Minimize width
 
:css('width', '1px')              -- Minimize width
:css('padding', '0px 2px 0px 0px')
+
:css('padding', '0 2px 0 0')
:cssText(args.imageleftstyle)
+
:cssText(args[cfg.arg.imageleftstyle])
:attr('rowspan', #listnums)
+
:attr('rowspan', listnums_size)
 
:tag('div')
 
:tag('div')
:wikitext(processItem(args.imageleft))
+
:wikitext(processItem(args[cfg.arg.imageleft]))
 
end
 
end
   −
if args['group' .. listnum] then
+
local group_and_num = format(cfg.arg.group_and_num, listnum)
 +
local groupstyle_and_num = format(cfg.arg.groupstyle_and_num, listnum)
 +
if args[group_and_num] then
 
local groupCell = row:tag('th')
 
local groupCell = row:tag('th')
    
-- id for aria-labelledby attribute, if lone group with no title or above
 
-- id for aria-labelledby attribute, if lone group with no title or above
if listnum == 1 and not (args.title or args.above or args.group2) then
+
if listnum == 1 and not (args[cfg.arg.title] or args[cfg.arg.above] or args[cfg.arg.group2]) then
 
groupCell
 
groupCell
:attr('id', mw.uri.anchorEncode(args.group1))
+
:attr('id', mw.uri.anchorEncode(args[cfg.arg.group1]))
 
end
 
end
    
groupCell
 
groupCell
 
:attr('scope', 'row')
 
:attr('scope', 'row')
:addClass('navbox-group')
+
:addClass(cfg.class.navbox_group)
:addClass(args.groupclass)
+
:addClass(args[cfg.arg.groupclass])
:cssText(args.basestyle)
+
:cssText(args[cfg.arg.basestyle])
:css('width', args.groupwidth or '1%') -- If groupwidth not specified, minimize width
+
-- If groupwidth not specified, minimize width
 +
:css('width', args[cfg.arg.groupwidth] or '1%')
    
groupCell
 
groupCell
:cssText(args.groupstyle)
+
:cssText(args[cfg.arg.groupstyle])
:cssText(args['group' .. listnum .. 'style'])
+
:cssText(args[groupstyle_and_num])
:wikitext(args['group' .. listnum])
+
:wikitext(args[group_and_num])
 
end
 
end
    
local listCell = row:tag('td')
 
local listCell = row:tag('td')
   −
if args['group' .. listnum] then
+
if args[group_and_num] then
 
listCell
 
listCell
:css('text-align', 'left')
+
:addClass(cfg.class.navbox_list_with_group)
:css('border-left-width', '2px')
  −
:css('border-left-style', 'solid')
   
else
 
else
 
listCell:attr('colspan', 2)
 
listCell:attr('colspan', 2)
 
end
 
end
   −
if not args.groupwidth then
+
if not args[cfg.arg.groupwidth] then
 
listCell:css('width', '100%')
 
listCell:css('width', '100%')
 
end
 
end
Line 242: Line 217:  
local rowstyle  -- usually nil so cssText(rowstyle) usually adds nothing
 
local rowstyle  -- usually nil so cssText(rowstyle) usually adds nothing
 
if index % 2 == 1 then
 
if index % 2 == 1 then
rowstyle = args.oddstyle
+
rowstyle = args[cfg.arg.oddstyle]
 
else
 
else
rowstyle = args.evenstyle
+
rowstyle = args[cfg.arg.evenstyle]
 
end
 
end
   −
local listText = args['list' .. listnum]
+
local list_and_num = format(cfg.arg.list_and_num, listnum)
local oddEven = ODD_EVEN_MARKER
+
local listText = args[list_and_num]
 +
local oddEven = cfg.marker.oddeven
 
if listText:sub(1, 12) == '</div><table' then
 
if listText:sub(1, 12) == '</div><table' then
 
-- Assume list text is for a subgroup navbox so no automatic striping for this row.
 
-- Assume list text is for a subgroup navbox so no automatic striping for this row.
oddEven = listText:find('<th[^>]*"navbox%-title"') and RESTART_MARKER or 'odd'
+
oddEven = listText:find(cfg.pattern.navbox_title) and cfg.marker.restart or cfg.class.navbox_odd_part
 
end
 
end
 +
 +
local liststyle_and_num = format(cfg.arg.liststyle_and_num, listnum)
 +
local listclass_and_num = format(cfg.arg.listclass_and_num, listnum)
 
listCell
 
listCell
:css('padding', '0px')
+
:css('padding', '0')
:cssText(args.liststyle)
+
:cssText(args[cfg.arg.liststyle])
 
:cssText(rowstyle)
 
:cssText(rowstyle)
:cssText(args['list' .. listnum .. 'style'])
+
:cssText(args[liststyle_and_num])
:addClass('navbox-list')
+
:addClass(cfg.class.navbox_list)
:addClass('navbox-' .. oddEven)
+
:addClass(cfg.class.navbox_part .. oddEven)
:addClass(args.listclass)
+
:addClass(args[cfg.arg.listclass])
:addClass(args['list' .. listnum .. 'class'])
+
:addClass(args[listclass_and_num])
 
:tag('div')
 
:tag('div')
:css('padding', (index == 1 and args.list1padding) or args.listpadding or '0em 0.25em')
+
:css('padding',
:wikitext(processItem(listText, args.nowrapitems))
+
(index == 1 and args[cfg.arg.list1padding]) or args[cfg.arg.listpadding] or '0 0.25em'
 +
)
 +
:wikitext(processItem(listText, args[cfg.arg.nowrapitems]))
   −
if index == 1 and args.image then
+
if index == 1 and args[cfg.arg.image] then
 
row
 
row
 
:tag('td')
 
:tag('td')
:addClass('noviewer')
+
:addClass(cfg.class.noviewer)
:addClass('navbox-image')
+
:addClass(cfg.class.navbox_image)
:addClass(args.imageclass)
+
:addClass(args[cfg.arg.imageclass])
 
:css('width', '1px')              -- Minimize width
 
:css('width', '1px')              -- Minimize width
:css('padding', '0px 0px 0px 2px')
+
:css('padding', '0 0 0 2px')
:cssText(args.imagestyle)
+
:cssText(args[cfg.arg.imagestyle])
:attr('rowspan', #listnums)
+
:attr('rowspan', listnums_size)
 
:tag('div')
 
:tag('div')
:wikitext(processItem(args.image))
+
:wikitext(processItem(args[cfg.arg.image]))
 
end
 
end
 
end
 
end
    +
-- uses this now to make the needHlistCategory correct
 +
-- to use later for when we add list styles via navbox
 +
local function has_list_class(htmlclass)
 +
local class_args = { -- rough order of probability of use
 +
cfg.arg.bodyclass, cfg.arg.listclass, cfg.arg.aboveclass,
 +
cfg.arg.belowclass, cfg.arg.titleclass, cfg.arg.navboxclass,
 +
cfg.arg.groupclass, cfg.arg.imageclass
 +
}
 +
local patterns = {
 +
'^' .. htmlclass .. '$',
 +
'%s' .. htmlclass .. '$',
 +
'^' .. htmlclass .. '%s',
 +
'%s' .. htmlclass .. '%s'
 +
}
 +
 +
for _, arg in ipairs(class_args) do
 +
for _, pattern in ipairs(patterns) do
 +
if mw.ustring.find(args[arg] or '', pattern) then
 +
return true
 +
end
 +
end
 +
end
 +
return false
 +
end
   −
--
+
local function needsHorizontalLists(border)
--  Tracking categories
+
if border == cfg.keyword.border_subgroup or args[cfg.arg.tracking] == cfg.keyword.tracking_no then
--
  −
 
  −
local function needsHorizontalLists()
  −
if border == 'subgroup' or args.tracking == 'no' then
   
return false
 
return false
 
end
 
end
local listClasses = {
+
return not has_list_class(cfg.pattern.hlist) and not has_list_class(cfg.pattern.plainlist)
['plainlist'] = true, ['hlist'] = true, ['hlist hnum'] = true,
  −
['hlist hwrap'] = true, ['hlist vcard'] = true, ['vcard hlist'] = true,
  −
['hlist vevent'] = true,
  −
}
  −
return not (listClasses[args.listclass] or listClasses[args.bodyclass])
   
end
 
end
    
local function hasBackgroundColors()
 
local function hasBackgroundColors()
for _, key in ipairs({'titlestyle', 'groupstyle', 'basestyle', 'abovestyle', 'belowstyle'}) do
+
for _, key in ipairs({cfg.arg.titlestyle, cfg.arg.groupstyle,
 +
cfg.arg.basestyle, cfg.arg.abovestyle, cfg.arg.belowstyle}) do
 
if tostring(args[key]):find('background', 1, true) then
 
if tostring(args[key]):find('background', 1, true) then
 
return true
 
return true
 
end
 
end
 
end
 
end
 +
return false
 
end
 
end
    
local function hasBorders()
 
local function hasBorders()
for _, key in ipairs({'groupstyle', 'basestyle', 'abovestyle', 'belowstyle'}) do
+
for _, key in ipairs({cfg.arg.groupstyle, cfg.arg.basestyle,
 +
cfg.arg.abovestyle, cfg.arg.belowstyle}) do
 
if tostring(args[key]):find('border', 1, true) then
 
if tostring(args[key]):find('border', 1, true) then
 
return true
 
return true
 
end
 
end
 
end
 
end
 +
return false
 
end
 
end
    
local function isIllegible()
 
local function isIllegible()
 
local styleratio = require('Module:Color contrast')._styleratio
 
local styleratio = require('Module:Color contrast')._styleratio
   
for key, style in pairs(args) do
 
for key, style in pairs(args) do
if tostring(key):match("style$") then
+
if tostring(key):match(cfg.pattern.style) then
 
if styleratio{mw.text.unstripNoWiki(style)} < 4.5 then
 
if styleratio{mw.text.unstripNoWiki(style)} < 4.5 then
 
return true
 
return true
Line 327: Line 326:  
end
 
end
   −
local function getTrackingCategories()
+
local function getTrackingCategories(border)
 
local cats = {}
 
local cats = {}
if needsHorizontalLists() then table.insert(cats, 'Navigational boxes without horizontal lists') end
+
if needsHorizontalLists(border) then table.insert(cats, cfg.category.horizontal_lists) end
if hasBackgroundColors() then table.insert(cats, 'Navboxes using background colours') end
+
if hasBackgroundColors() then table.insert(cats, cfg.category.background_colors) end
if isIllegible() then table.insert(cats, 'Potentially illegible navboxes') end
+
if isIllegible() then table.insert(cats, cfg.category.illegible) end
if hasBorders() then table.insert(cats, 'Navboxes using borders') end
+
if hasBorders() then table.insert(cats, cfg.category.borders) end
 
return cats
 
return cats
 
end
 
end
   −
local function renderTrackingCategories(builder)
+
local function renderTrackingCategories(builder, border)
 
local title = mw.title.getCurrentTitle()
 
local title = mw.title.getCurrentTitle()
 
if title.namespace ~= 10 then return end -- not in template space
 
if title.namespace ~= 10 then return end -- not in template space
 
local subpage = title.subpageText
 
local subpage = title.subpageText
if subpage == 'doc' or subpage == 'sandbox' or subpage == 'testcases' then return end
+
if subpage == cfg.keyword.subpage_doc or subpage == cfg.keyword.subpage_sandbox
 +
or subpage == cfg.keyword.subpage_testcases then return end
   −
for _, cat in ipairs(getTrackingCategories()) do
+
for _, cat in ipairs(getTrackingCategories(border)) do
 
builder:wikitext('[[Category:' .. cat .. ']]')
 
builder:wikitext('[[Category:' .. cat .. ']]')
 
end
 
end
 
end
 
end
   −
--
+
local function renderMainTable(border, listnums)
--  Main navbox tables
  −
--
  −
local function renderMainTable()
   
local tbl = mw.html.create('table')
 
local tbl = mw.html.create('table')
:addClass('nowraplinks')
+
:addClass(cfg.class.nowraplinks)
:addClass(args.bodyclass)
+
:addClass(args[cfg.arg.bodyclass])
   −
if args.title and (args.state ~= 'plain' and args.state ~= 'off') then
+
local state = args[cfg.arg.state]
if args.state == 'collapsed' then args.state = 'mw-collapsed' end
+
if args[cfg.arg.title] and state ~= cfg.keyword.state_plain and state ~= cfg.keyword.state_off then
 +
if state == cfg.keyword.state_collapsed then
 +
state = cfg.class.collapsed
 +
end
 
tbl
 
tbl
:addClass('mw-collapsible')
+
:addClass(cfg.class.collapsible)
:addClass(args.state or 'autocollapse')
+
:addClass(state or cfg.class.autocollapse)
 
end
 
end
    
tbl:css('border-spacing', 0)
 
tbl:css('border-spacing', 0)
if border == 'subgroup' or border == 'none' then
+
if border == cfg.keyword.border_subgroup or border == cfg.keyword.border_none then
 
tbl
 
tbl
:addClass('navbox-subgroup')
+
:addClass(cfg.class.navbox_subgroup)
:cssText(args.bodystyle)
+
:cssText(args[cfg.arg.bodystyle])
:cssText(args.style)
+
:cssText(args[cfg.arg.style])
 
else  -- regular navbox - bodystyle and style will be applied to the wrapper table
 
else  -- regular navbox - bodystyle and style will be applied to the wrapper table
 
tbl
 
tbl
:addClass('navbox-inner')
+
:addClass(cfg.class.navbox_inner)
 
:css('background', 'transparent')
 
:css('background', 'transparent')
 
:css('color', 'inherit')
 
:css('color', 'inherit')
 
end
 
end
tbl:cssText(args.innerstyle)
+
tbl:cssText(args[cfg.arg.innerstyle])
    
renderTitleRow(tbl)
 
renderTitleRow(tbl)
 
renderAboveRow(tbl)
 
renderAboveRow(tbl)
 +
local listnums_size = #listnums
 
for i, listnum in ipairs(listnums) do
 
for i, listnum in ipairs(listnums) do
renderListRow(tbl, i, listnum)
+
renderListRow(tbl, i, listnum, listnums_size)
 
end
 
end
 
renderBelowRow(tbl)
 
renderBelowRow(tbl)
    
return tbl
 
return tbl
 +
end
 +
 +
local function add_navbox_styles()
 +
local frame = mw.getCurrentFrame()
 +
-- This is a lambda so that it doesn't need the frame as a parameter
 +
local function add_user_styles(templatestyles)
 +
if templatestyles and templatestyles ~= '' then
 +
return frame:extensionTag{
 +
name = 'templatestyles', args = { src = templatestyles }
 +
}
 +
end
 +
return ''
 +
end
 +
 +
-- get templatestyles. load base from config so that Lua only needs to do
 +
-- the work once of parser tag expansion
 +
local base_templatestyles = cfg.templatestyles
 +
local templatestyles = add_user_styles(args[cfg.arg.templatestyles])
 +
local child_templatestyles = add_user_styles(args[cfg.arg.child_templatestyles])
 +
 +
-- The 'navbox-styles' div exists for two reasons:
 +
--  1. To wrap the styles to work around T200206 more elegantly. Instead
 +
--    of combinatorial rules, this ends up being linear number of CSS rules.
 +
--  2. To allow MobileFrontend to rip the styles out with 'nomobile' such that
 +
--    they are not dumped into the mobile view.
 +
return mw.html.create('div')
 +
:addClass(cfg.class.navbox_styles)
 +
:addClass(cfg.class.nomobile)
 +
:wikitext(base_templatestyles .. templatestyles .. child_templatestyles)
 +
:done()
 
end
 
end
    
function p._navbox(navboxArgs)
 
function p._navbox(navboxArgs)
 
args = navboxArgs
 
args = navboxArgs
listnums = {}
+
local listnums = {}
    
for k, _ in pairs(args) do
 
for k, _ in pairs(args) do
 
if type(k) == 'string' then
 
if type(k) == 'string' then
local listnum = k:match('^list(%d+)$')
+
local listnum = k:match(cfg.pattern.listnum)
 
if listnum then table.insert(listnums, tonumber(listnum)) end
 
if listnum then table.insert(listnums, tonumber(listnum)) end
 
end
 
end
Line 398: Line 429:  
table.sort(listnums)
 
table.sort(listnums)
   −
border = mw.text.trim(args.border or args[1] or '')
+
local border = mw.text.trim(args[cfg.arg.border] or args[1] or '')
if border == 'child' then
+
if border == cfg.keyword.border_child then
border = 'subgroup'
+
border = cfg.keyword.border_subgroup
 
end
 
end
    
-- render the main body of the navbox
 
-- render the main body of the navbox
local tbl = renderMainTable()
+
local tbl = renderMainTable(border, listnums)
   −
-- render the appropriate wrapper around the navbox, depending on the border param
   
local res = mw.html.create()
 
local res = mw.html.create()
if border == 'none' then
+
-- render the appropriate wrapper for the navbox, based on the border param
 +
 
 +
if border == cfg.keyword.border_none then
 +
res:node(add_navbox_styles())
 
local nav = res:tag('div')
 
local nav = res:tag('div')
 
:attr('role', 'navigation')
 
:attr('role', 'navigation')
 
:node(tbl)
 
:node(tbl)
 
-- aria-labelledby title, otherwise above, otherwise lone group
 
-- aria-labelledby title, otherwise above, otherwise lone group
if args.title or args.above or (args.group1 and not args.group2) then
+
if args[cfg.arg.title] or args[cfg.arg.above] or (args[cfg.arg.group1]
nav:attr('aria-labelledby', mw.uri.anchorEncode(args.title or args.above or args.group1))
+
and not args[cfg.arg.group2]) then
 +
nav:attr(
 +
'aria-labelledby',
 +
mw.uri.anchorEncode(
 +
args[cfg.arg.title] or args[cfg.arg.above] or args[cfg.arg.group1]
 +
)
 +
)
 
else
 
else
nav:attr('aria-label', 'Navbox')
+
nav:attr('aria-label', cfg.aria_label)
 
end
 
end
elseif border == 'subgroup' then
+
elseif border == cfg.keyword.border_subgroup then
-- We assume that this navbox is being rendered in a list cell of a parent navbox, and is
+
-- We assume that this navbox is being rendered in a list cell of a
-- therefore inside a div with padding:0em 0.25em. We start with a </div> to avoid the
+
-- parent navbox, and is therefore inside a div with padding:0em 0.25em.
-- padding being applied, and at the end add a <div> to balance out the parent's </div>
+
-- We start with a </div> to avoid the padding being applied, and at the
 +
-- end add a <div> to balance out the parent's </div>
 
res
 
res
 
:wikitext('</div>')
 
:wikitext('</div>')
Line 427: Line 467:  
:wikitext('<div>')
 
:wikitext('<div>')
 
else
 
else
 +
res:node(add_navbox_styles())
 
local nav = res:tag('div')
 
local nav = res:tag('div')
 
:attr('role', 'navigation')
 
:attr('role', 'navigation')
:addClass('navbox')
+
:addClass(cfg.class.navbox)
:addClass(args.navboxclass)
+
:addClass(args[cfg.arg.navboxclass])
:cssText(args.bodystyle)
+
:cssText(args[cfg.arg.bodystyle])
:cssText(args.style)
+
:cssText(args[cfg.arg.style])
 
:css('padding', '3px')
 
:css('padding', '3px')
 
:node(tbl)
 
:node(tbl)
 
-- aria-labelledby title, otherwise above, otherwise lone group
 
-- aria-labelledby title, otherwise above, otherwise lone group
if args.title or args.above or (args.group1 and not args.group2) then
+
if args[cfg.arg.title] or args[cfg.arg.above]
nav:attr('aria-labelledby', mw.uri.anchorEncode(args.title or args.above or args.group1))
+
or (args[cfg.arg.group1] and not args[cfg.arg.group2]) then
 +
nav:attr(
 +
'aria-labelledby',
 +
mw.uri.anchorEncode(args[cfg.arg.title] or args[cfg.arg.above] or args[cfg.arg.group1])
 +
)
 
else
 
else
nav:attr('aria-label', 'Navbox')
+
nav:attr('aria-label', cfg.aria_label)
 
end
 
end
 
end
 
end
   −
if (args.nocat or 'false'):lower() == 'false' then
+
if (args[cfg.arg.nocat] or cfg.keyword.nocat_false):lower() == cfg.keyword.nocat_false then
renderTrackingCategories(res)
+
renderTrackingCategories(res, border)
 
end
 
end
return striped(tostring(res))
+
return striped(tostring(res), border)
 
end
 
end
   Line 453: Line 498:  
getArgs = require('Module:Arguments').getArgs
 
getArgs = require('Module:Arguments').getArgs
 
end
 
end
args = getArgs(frame, {wrappers = {'Template:Navbox'}})
+
args = getArgs(frame, {wrappers = {cfg.pattern.navbox}})
   −
-- Read the arguments in the order they'll be output in, to make references number in the right order.
+
-- Read the arguments in the order they'll be output in, to make references
 +
-- number in the right order.
 
local _
 
local _
_ = args.title
+
_ = args[cfg.arg.title]
_ = args.above
+
_ = args[cfg.arg.above]
 +
-- Limit this to 20 as covering 'most' cases (that's a SWAG) and because
 +
-- iterator approach won't work here
 
for i = 1, 20 do
 
for i = 1, 20 do
_ = args["group" .. tostring(i)]
+
_ = args[format(cfg.arg.group_and_num, i)]
_ = args["list" .. tostring(i)]
+
_ = args[format(cfg.arg.list_and_num, i)]
 
end
 
end
_ = args.below
+
_ = args[cfg.arg.below]
    
return p._navbox(args)
 
return p._navbox(args)
Anonymous user