Module:Sidebar: Difference between revisions

tableless layout (div instead of table)
self rv per trouble reports
Line 31: Line 31:
if not child then
if not child then
root = root
root = root
:tag('div')
:tag('table')
:attr('role', args.role)
:attr('aria-labelledby', args.outertitle and mw.uri.anchorEncode(args.outertitle) or args.title and mw.uri.anchorEncode(args.title))
:attr('aria-label', (args.outertitle or args.title) and nil or 'Sidebar')
:addClass('vertical-navbox')
:addClass('vertical-navbox')
:addClass(args.wraplinks ~= 'true' and 'nowraplinks' or nil)
:addClass(args.wraplinks ~= 'true' and 'nowraplinks' or nil)
:addClass(args.bodyclass or args.class)
:addClass(args.bodyclass or args.class)
:css('position', 'relative')
:css('clear', args.float == 'none' and 'both' or args.float or 'right')
:css('float', args.float or 'right')
:css('float', args.float or 'right')
:css('box-sizing', 'border-box')
:css('clear', (args.float == 'none' and 'both') or args.float or 'right')
:css('margin-left', args.float == 'right' and '1em' or nil)
:css('margin-right', args.float == 'left' and '1em' or nil)
:css('margin-bottom', '1em')
:css('width', args.width or '22.0em')
: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('border', '1px solid #aaa')
:css('padding', '0.3em 0.5em')
:css('padding', '0.2em')
:css('background', '#f9f9f9')
:css('border-spacing', '0.4em 0')
:css('text-align', 'center')
:css('line-height', '1.4em')
:css('line-height', '1.4em')
:css('font-size', '88%')
:css('font-size', '88%')
:css('text-align', 'center')
:cssText(args.bodystyle or args.style)
:cssText(args.bodystyle or args.style)


if args.outertitle then
if args.outertitle then
root
root
:css('margin-top', '1.6em')
:tag('caption')
:tag('div')
:attr('id', mw.uri.anchorEncode(args.outertitle))
:addClass(args.outertitleclass)
:addClass(args.outertitleclass)
:css('position', 'absolute')
:css('padding-bottom', '0.2em')
:css('top', '-1.4em')
:css('left', '0')
:css('width', '100%')
:css('font-size', '125%')
:css('font-size', '125%')
:css('line-height', '1.2em')
:css('line-height', '1.2em')
Line 72: Line 61:


if args.topimage then
if args.topimage then
local imageContainer = root:tag('div')
local imageCell = root:tag('tr'):tag('td')


imageContainer
imageCell
:addClass(args.topimageclass)
:addClass(args.topimageclass)
:css('padding', '0.4em 0')
:css('padding', '0.4em 0')
Line 81: Line 70:


if args.topcaption then
if args.topcaption then
imageContainer
imageCell
:tag('div')
:tag('div')
:css('padding-top', '0.2em')
:css('padding-top', '0.2em')
Line 92: Line 81:
if args.pretitle then
if args.pretitle then
root
root
:tag('div')
:tag('tr')
:addClass(args.pretitleclass)
:tag('td')
:cssText(args.basestyle)
:addClass(args.pretitleclass)
:css('padding-top', args.topimage and '0.2em' or '0.4em')
:cssText(args.basestyle)
:css('line-height', '1.2em')
:css('padding-top', args.topimage and '0.2em' or '0.4em')
:cssText(args.pretitlestyle)
:css('line-height', '1.2em')
:wikitext(args.pretitle)
:cssText(args.pretitlestyle)
:wikitext(args.pretitle)
end
end


Line 107: Line 97:
root
root
:wikitext(args.title)
:wikitext(args.title)
:wikitext('</th></tr>') -- @todo replace this with unclosed again once mw.html gets it
else
else
root
root
:tag('div')
:tag('tr')
:attr('id', (args.outertitle or args.pretitle) and nil or mw.uri.anchorEncode(args.title))
:tag('th')
:addClass(args.titleclass)
:addClass(args.titleclass)
:cssText(args.basestyle)
:cssText(args.basestyle)
:css('padding', '0.2em 0.4em 0.2em')
:css('padding', '0.2em 0.4em 0.2em')
:css('padding-top', args.pretitle and 0)
:css('padding-top', args.pretitle and 0)
:css('font-size', '145%')
:css('font-size', '145%')
:css('line-height', '1.2em')
:css('line-height', '1.2em')
:css('font-weight', 'bold')
:cssText(args.titlestyle)
:cssText(args.titlestyle)
:wikitext(args.title)
:wikitext(args.title)
end
end
end
end


if args.image then
if args.image then
local imageContainer = root:tag('div')
local imageCell = root:tag('tr'):tag('td')


imageContainer
imageCell
:addClass(args.imageclass)
:addClass(args.imageclass)
:css('padding', '0.2em 0 0.4em')
:css('padding', '0.2em 0 0.4em')
Line 133: Line 123:


if args.caption then
if args.caption then
imageContainer
imageCell
:tag('div')
:tag('div')
:css('padding-top', '0.2em')
:css('padding-top', '0.2em')
Line 144: Line 134:
if args.above then
if args.above then
root
root
:tag('div')
:tag('tr')
:addClass(args.aboveclass)
:tag('td')
:css('padding', '0.3em 0.4em 0.3em')
:addClass(args.aboveclass)
:css('font-weight', 'bold')
:css('padding', '0.3em 0.4em 0.3em')
:cssText(args.abovestyle)
:css('font-weight', 'bold')
:newline() -- newline required for bullet-points to work
:cssText(args.abovestyle)
:wikitext(args.above)
:newline() -- newline required for bullet-points to work
:wikitext(args.above)
end
end


local parameterNumbers = {}
local rowNums = {}
for k, _ in pairs(args) do
for k, v in pairs(args) do
k = '' .. k
k = '' .. k
local num = k:match('^heading(%d+)$') or k:match('^content(%d+)$')
local num = k:match('^heading(%d+)$') or k:match('^content(%d+)$')
if num then table.insert(parameterNumbers, tonumber(num)) end
if num then table.insert(rowNums, tonumber(num)) end
end
end
table.sort(parameterNumbers)
table.sort(rowNums)
-- remove duplicates from the list (e.g. 3 will be duplicated if both heading3 and content3 are specified)
-- remove duplicates from the list (e.g. 3 will be duplicated if both heading3 and content3 are specified)
for i = #parameterNumbers, 1, -1 do
for i = #rowNums, 1, -1 do
if parameterNumbers[i] == parameterNumbers[i - 1] then
if rowNums[i] == rowNums[i - 1] then
table.remove(parameterNumbers, i)
table.remove(rowNums, i)
end
end
end
end


for i, num in ipairs(parameterNumbers) do
for i, num in ipairs(rowNums) do
local heading = args['heading' .. num]
local heading = args['heading' .. num]
if heading then
if heading then
root
root
:tag('div')
:tag('tr')
:addClass(args.headingclass)
:tag('th')
:css('padding', '0.1em')
:addClass(args.headingclass)
:css('font-weight', 'bold')
:css('padding', '0.1em')
:cssText(args.basestyle)
:cssText(args.basestyle)
:cssText(args.headingstyle)
:cssText(args.headingstyle)
:cssText(args['heading' .. num .. 'style'])
:cssText(args['heading' .. num .. 'style'])
:newline()
:newline()
:wikitext(heading)
:wikitext(heading)
end
end


Line 185: Line 176:
if content then
if content then
root
root
:tag('div')
:tag('tr')
:addClass(args.contentclass)
:tag('td')
:css('padding', i == #parameterNumbers and '0 0.1em' or '0 0.1em 0.4em') -- no bottom padding on last content
:addClass(args.contentclass)
:cssText(args.contentstyle)
:css('padding', '0 0.1em 0.4em')
:cssText(args['content' .. num .. 'style'])
:cssText(args.contentstyle)
:newline()
:cssText(args['content' .. num .. 'style'])
:wikitext(content)
:newline()
:done()
:wikitext(content)
:newline() -- Without a linebreak after the </td>, a nested list like "* {{hlist| ...}}" doesn't parse correctly.
:done()
:newline() -- Without a linebreak after the </td>, a nested list like "* {{hlist| ...}}" doesn't parse correctly.
end
end
end
end
Line 199: Line 191:
if args.below then
if args.below then
root
root
:tag('div')
:tag('tr')
:addClass(args.belowclass)
:tag('td')
:css('margin-top', '0.4em')
:addClass(args.belowclass)
:css('padding', '0.3em 0.4em 0.3em')
:css('padding', '0.3em 0.4em 0.3em')
:css('font-weight', 'bold')
:css('font-weight', 'bold')
:cssText(args.belowstyle)
:cssText(args.belowstyle)
:newline()
:newline()
:wikitext(args.below)
:wikitext(args.below)
end
end


Line 213: Line 205:
if navbarArg ~= 'none' and navbarArg ~= 'off' and (args.name or frame:getParent():getTitle():gsub('/sandbox$', '') ~= 'Template:Sidebar') then
if navbarArg ~= 'none' and navbarArg ~= 'off' and (args.name or frame:getParent():getTitle():gsub('/sandbox$', '') ~= 'Template:Sidebar') then
root
root
:tag('div')
:tag('tr')
:css('text-align', 'right')
:tag('td')
:css('font-size', '115%')
:css('text-align', 'right')
:cssText(args.navbarstyle or args.tnavbarstyle)
:css('font-size', '115%')
:wikitext(navbar{
:cssText(args.navbarstyle or args.tnavbarstyle)
args.name,
:wikitext(navbar{
mini = 1,
args.name,
fontstyle = args.navbarfontstyle or args.tnavbarfontstyle
mini = 1,
})
fontstyle = args.navbarfontstyle or args.tnavbarfontstyle
})
end
end
end
end