Changes

require('Module:No globals') 

local getArgslocal HtmlBuilder = require('Module:HtmlBuilderArguments').getArgs

-- For compatibility with the original {{sidebar with collapsible lists}}

local function _sidebarp.sidebar(frame, args) if not args then args = getArgs(frame) end local root = HtmlBuildermw.html.create()

.:tag('table') .:addClass('vertical-navbox') .:addClass(args.wraplinks ~= 'true' and 'nowraplinks'or nil) .:addClass(args.bodyclass or args.class) .attr('cellspacing', args.cellspacing or 5) .attr('cellpadding', args.cellpadding or 0) .:css('float', args.float or 'right') .:css('clear', (args.float == 'none' and 'both') or args.float or 'right') .:css('width', args.width or '22.0em') .:css('margin', args.float == 'left' and '0 1.0em 1.0em 0' or '0 0 1.0em 1.0em') .:css('background', '#f9f9f9') .:css('border', '1px solid #aaa') .:css('padding', '0.2em') .:css('border-spacing', '0.4em 0') .:css('text-align', 'center') .:css('line-height', '1.4em') .:css('font-size', '88%') .:cssText(args.bodystyle or args.style)

.:tag('caption') .:addClass(args.outertitleclass) .:css('padding-bottom', '0.2em') .:css('font-size', '125%') .:css('line-height', '1.2em') .:css('font-weight', 'bold') .:cssText(args.outertitlestyle) .:wikitext(args.outertitle)

local imageCell = root.:tag('tr').:tag('td')

.:addClass(args.topimageclass) .:css('padding', '0.4em 0') .:cssText(args.topimagestyle) .:wikitext(args.topimage)

.:tag('div') .:css('padding-top', '0.2em') .:css('line-height', '1.2em') .:cssText(args.topcaptionstyle) .:wikitext(args.topcaption)

.:tag('tr') .:tag('td') .:addClass(args.pretitleclass) .:cssText(args.basestyle) .:css('padding-top', args.topimage and '0.2em' or '0.4em') .:css('line-height', '1.2em') .:cssText(args.pretitlestyle) .:wikitext(args.pretitle)

.:wikitext(args.title) .tag:wikitext('</th', {unclosed = true}) .tag('></tr>', {) -- @todo replace this with unclosed = true})again once mw.html gets it

.:tag('tr') .:tag('th') .:addClass(args.titleclass) .:cssText(args.basestyle) .:css('padding', '0.2em 0.4em 0.2em') .:css('padding-top', args.pretitle and 0) .:css('font-size', '145%') .:css('line-height', '1.2em') .:cssText(args.titlestyle) .:wikitext(args.title)

local imageCell = root.:tag('tr').:tag('td')

.:addClass(args.imageclass) .:css('padding', '0.2em 0 0.4em') .:cssText(args.imagestyle) .:wikitext(args.image)

.:tag('div') .:css('padding-top', '0.2em') .:css('line-height', '1.2em') .:cssText(args.captionstyle) .:wikitext(args.caption)

.:tag('tr') .:tag('td') .:addClass(args.aboveclass) .:css('padding', '0.3em 0.4em 0.3em') .:css('font-weight', 'bold') .:cssText(args.abovestyle) .:newline() -- newline required for bullet-points to work .:wikitext(args.above)

.:tag('tr') .:tag('th') .:addClass(args.headingclass) .:css('padding', '0.1em') .:cssText(args.basestyle) .:cssText(args.headingstyle) .:cssText(args['heading' .. num .. 'style']) .:newline() .:wikitext(heading)

.:tag('tr') .:tag('td') .:addClass(args.contentclass) .:css('padding', '0 0.1em 0.4em') .:cssText(args.contentstyle) .:cssText(args['content' .. num .. 'style']) .:newline() .:wikitext(content) .:done() .:newline() -- Without a linebreak after the </td>, a nested list like "* {{hlist| ...}}" doesn't parse correctly.

.:tag('tr') .:tag('td') .:addClass(args.belowclass) .:css('padding', '0.3em 0.4em 0.3em') .:css('font-weight', 'bold') .:cssText(args.belowstyle) .:newline() .:wikitext(args.below)

if navbarArg ~= 'none' and navbarArg ~= 'off' and (args.name or frame:getParent():getTitle():gsub('/sandbox$', '') ~= 'Template:Sidebar') then

.:tag('tr') .:tag('td') .:css('text-align', 'right') .:css('font-size', '115%') .:cssText(args.navbarstyle or args.tnavbarstyle) .:wikitext(navbar{

function _collapsibleSidebarp.collapsible(frame) local args= getArgs(frame) 

if not args.name and frame:getParent():getTitle():gsub('/sandbox$', '') == 'Template:Sidebar with collapsible lists' then args.navbar = 'none' end 

local num = ('' .string. k):match(k, '^list(%d+)$') if num then

local row = HtmlBuildermw.html.create('div')

.:addClass('NavFrame') .:addClass((not expand) and 'collapsed'or nil) .:css('border', 'none') .:css('padding', 0) .:cssText(args.listframestyle) .:cssText(args['list' .. num .. 'framestyle']) .:tag('div') .:addClass('NavHead') .:addClass(args.listtitleclass) .:css('font-size', '105%') .:css('background', 'transparent') .:css('text-align', 'left') .:cssText(args.basestyle) .:cssText(args.listtitlestyle) .:cssText(args['list' .. num .. 'titlestyle']) .:wikitext(trimAndAddAutomaticNewline(args['list' .. num .. 'title'] or 'List')) .:done() .:tag('div') .:addClass('NavContent') .:addClass(args.listclass) .:addClass(args['list' .. num .. 'class']) .:css('font-size', '105%') .:css('padding', '0.2em 0 0.4em') .:css('text-align', 'center') .:cssText(args.liststyle) .:cssText(args['list' .. num .. 'style']) .:wikitext(trimAndAddAutomaticNewline(args['list' .. num]))

return _sidebar(args)end function makeWrapper(func) return function(frame) if not getArgs then getArgs = require('Module:Arguments')p.getArgs end return func(getArgssidebar(frame, args)) end

return { sidebar = makeWrapper(_sidebar), collapsible = makeWrapper(_collapsibleSidebar)}p