Module:Sidebar - Revision history

Vincent: 28 revisions imported

2019-09-10T01:33:41Z

28 revisions imported

en>Frietjes: update from sandbox per discussion on talk page

2017-12-19T17:22:53Z

update from sandbox per discussion on talk page

en>Frietjes: add some tracking with Category:Pages using sidebar with the child parameter

2017-11-23T13:28:26Z

add some tracking with Category:Pages using sidebar with the child parameter

en>Matt Fitzpatrick: self rv per trouble reports

2017-06-03T00:20:26Z

self rv per trouble reports

Show changes

en>Matt Fitzpatrick: tableless layout (div instead of table)

2017-06-03T00:09:21Z

tableless layout (div instead of table)

Show changes

en>Jackmcbarn: prevent bad navbars from appearing

2015-02-12T20:33:37Z

prevent bad navbars from appearing

en>Jackmcbarn: use mw.html

2014-12-01T01:39:59Z

use mw.html

Show changes

en>Jackmcbarn: ...again, lack of testcases are letting problems slip through to articles. I'll fix that shortly

2014-11-25T03:08:54Z

...again, lack of testcases are letting problems slip through to articles. I'll fix that shortly

en>Jackmcbarn: fix wrong function name (why are there no test cases for this?)

2014-11-25T03:06:02Z

fix wrong function name (why are there no test cases for this?)

en>Jackmcbarn: fix incorrect navbars, and other minor fixes from sandbox

2014-11-25T02:55:47Z

fix incorrect navbars, and other minor fixes from sandbox

@@ Line 19: / Line 19: @@
 	else
 		return s
 	end
 end
@@ Line 29: / Line 37: @@
 	local child = args.child and mw.text.trim(args.child) == 'yes'
 	if not child then
-		root = root
+		root
 			:addClass('vertical-navbox')
 			:addClass(args.wraplinks ~= 'true' and 'nowraplinks' or nil)
@@ Line 90: / Line 98: @@
 						:wikitext(args.pretitle)
 		end
+	else
 	end
@@ Line 97: / Line 112: @@
 			root
 				:wikitext(args.title)
 		else
 			root
@@ Line 179: / Line 193: @@
 					:tag('td')
 						:addClass(args.contentclass)
-						:css('padding', '0 0.1em 0.4em')
+						:css('padding', hasSubgroup(content) and '0.1em 0 0.2em' or '0 0.1em 0.4em')
 						:cssText(args.contentstyle)
 						:cssText(args['content' .. num .. 'style'])

@@ Line 218: / Line 218: @@
 	end
-	return tostring(root)
+	return tostring(root) .. (child and '[[Category:Pages using sidebar with the child parameter]]' or '')
 end

@@ Line 227: / Line 227: @@
 	args.belowstyle = 'border-top: 1px solid #aaa; border-bottom: 1px solid #aaa;' .. (args.belowstyle or '')
 	args.navbarstyle = 'padding-top: 0.6em;' .. (args.navbarstyle or args.tnavbarstyle or '')
 	local contentArgs = {}

@@ Line 275: / Line 275: @@
 	end
-	return p.sidebar(args)
+	return p.sidebar(frame, args)
 end
 return p

@@ Line 223: / Line 223: @@
 end
-function p.collapsibleSidebar(frame)
+function p.collapsible(frame)
 	local args = getArgs(frame)

← Older revision	Revision as of 01:33, 10 September 2019
(No difference)

@@ Line 2: / Line 2: @@
 -- This module implements {{Sidebar}}
 --
+require('Module:No globals')
 local p = {}
-−
-local getArgs
+local getArgs = require('Module:Arguments').getArgs
 local HtmlBuilder = require('Module:HtmlBuilder')
 local navbar = require('Module:Navbar')._navbar
-−
 local function trimAndAddAutomaticNewline(s)
 	-- For compatibility with the original {{sidebar with collapsible lists}}
 	-- implementation, which passed some parameters through {{#if}} to trim
 	-- their whitespace. This also triggered the automatic newline behavior.
@@ Line 22: / Line 23: @@
 end
-local function _sidebar(args)
+function p.sidebar(frame, args)
 	local root = HtmlBuilder.create()
 	local child = args.child and mw.text.trim(args.child) == 'yes'
-−
 	if not child then
 		root = root
@@ Line 44: / Line 48: @@
 			.css('font-size', '88%')
 			.cssText(args.bodystyle or args.style)
-−
 		if args.outertitle then
 			root
@@ Line 56: / Line 60: @@
 					.wikitext(args.outertitle)
 		end
-−
 		if args.topimage then
 			local imageCell = root.tag('tr').tag('td')
-−
 			imageCell
 				.addClass(args.topimageclass)
@@ Line 65: / Line 69: @@
 				.cssText(args.topimagestyle)
 				.wikitext(args.topimage)
-−
 			if args.topcaption then
 				imageCell
@@ Line 75: / Line 79: @@
 			end
 		end
-−
 		if args.pretitle then
 			root
@@ Line 113: / Line 117: @@
 	if args.image then
 		local imageCell = root.tag('tr').tag('td')
-−
 		imageCell
 			.addClass(args.imageclass)
@@ Line 119: / Line 123: @@
 			.cssText(args.imagestyle)
 			.wikitext(args.image)
-−
 		if args.caption then
 			imageCell
@@ Line 129: / Line 133: @@
 		end
 	end
-−
 	if args.above then
 		root
@@ Line 138: / Line 142: @@
 					.css('font-weight', 'bold')
 					.cssText(args.abovestyle)
-					.newline()	  -- newline required for bullet-points to work
+					.newline() -- newline required for bullet-points to work
 					.wikitext(args.above)
 	end
@@ Line 170: / Line 174: @@
 						.wikitext(heading)
 		end
-−
 		local content = args['content' .. num]
 		if content then
@@ Line 183: / Line 187: @@
 						.wikitext(content)
 						.done()
-					.newline()  -- Without a linebreak after the </td>, a nested list like "* {{hlist| ...}}" doesn't parse correctly.
+					.newline() -- Without a linebreak after the </td>, a nested list like "* {{hlist| ...}}" doesn't parse correctly.
 		end
 	end
@@ Line 201: / Line 205: @@
 	if not child then
 		local navbarArg = args.navbar or args.tnavbar
-		if navbarArg ~= 'none' and navbarArg ~= 'off' then
+		if navbarArg ~= 'none' and navbarArg ~= 'off' and (args.name or frame:getParent():getTitle():gsub('/sandbox$', '') ~= 'Template:Sidebar') then
 			root
 				.tag('tr')
@@ Line 219: / Line 223: @@
 end
-function _collapsibleSidebar(args)
+function p.collapsibleSidebar(frame)
 	args.abovestyle = 'border-top: 1px solid #aaa; border-bottom: 1px solid #aaa;' .. (args.abovestyle or '')
 	args.belowstyle = 'border-top: 1px solid #aaa; border-bottom: 1px solid #aaa;' .. (args.belowstyle or '')
 	args.navbarstyle = 'padding-top: 0.6em;' .. (args.navbarstyle or args.tnavbarstyle or '')
-−
 	local contentArgs = {}
-−
 	for k, v in pairs(args) do
-		local num = ('' .. k):match('^list(%d+)$')
+		local num = string.match(k, '^list(%d+)$')
 		if num then
 			local expand = args.expanded and (args.expanded == 'all' or args.expanded == args['list' .. num .. 'name'])
-−
 			local row = HtmlBuilder.create('div')
 			row
@@ Line 260: / Line 266: @@
 					.cssText(args['list' .. num .. 'style'])
 					.wikitext(trimAndAddAutomaticNewline(args['list' .. num]))
-−
 			contentArgs['content' .. num] = tostring(row)
 		end
@@ Line 268: / Line 274: @@
 		args[k] = v
 	end
-−
-	return _sidebar(args)
+	return p.sidebar(args)
 end
-return {
+return p