Module:Progression rainbow/sandbox - Revision history

WOSlinker: use require('strict') instead of require('Module:No globals')

2022-10-21T10:04:48Z

use require('strict') instead of require('Module:No globals')

← Previous revision		Revision as of 10:04, 21 October 2022
Line 3:		Line 3:

	]]		]]
	require('~~Module:No globals~~')		require('strict')

	local p = {}		local p = {}

The wub: allow specifying custom height

2022-10-10T13:17:33Z

allow specifying custom height

← Previous revision		Revision as of 13:17, 10 October 2022
Line 96:		Line 96:
	total = tonumber(args[9]) or 100		total = tonumber(args[9]) or 100
	end		end

			local height = arg_or_default(args, 'height', nil)

	local root = mw.html.create('ul')		local root = mw.html.create('ul')
	root:addClass('progression-rainbow')		root:addClass('progression-rainbow')
			if height then
			root:css('height', height)
			end

	local current_frame = mw.getCurrentFrame()		local current_frame = mw.getCurrentFrame()

The wub: add title attribute for tooltips

2022-10-10T12:56:14Z

add title attribute for tooltips

← Previous revision		Revision as of 12:56, 10 October 2022
Line 110:		Line 110:
	})		})
	:css('width', percentage)		:css('width', percentage)
			:attr('title', string.format('%s %s', percentage, class.category))
	:tag('span')		:tag('span')
	:addClass('sr-only')		:addClass('sr-only')
Line 124:		Line 125:
	:addClass('remaining')		:addClass('remaining')
	:css('width', remaining)		:css('width', remaining)
			:attr('title', string.format('%s remaining', remaining))
	:tag('span')		:tag('span')
	:addClass('sr-only')		:addClass('sr-only')

The wub: update to match main module

2022-10-10T12:48:08Z

update to match main module

← Previous revision		Revision as of 12:48, 10 October 2022
Line 5:		Line 5:
	require('Module:No globals')		require('Module:No globals')

⚫	~~local getArgs =~~ require('Module:Arguments').getArgs
	local p = {}		local p = {}

Line 13:		Line 12:
	end		end

	local function ~~class_percent~~(param, total)		local function percent(param, total)
	-- These suck for i18n because the % is forced to the right without spacing,		-- These suck for i18n because the % is forced to the right without spacing,
	-- both in a required context (CSS) and unrequired (to-be-displayed text).		-- both in a required context (CSS) and unrequired (to-be-displayed text).
	-- I.e., there should be a separate version of this ~~or a function parameter~~		-- I.e., there should be a separate version of this
	-- which takes a boolean. :(
	return tostring(round(100 * param / total)) .. '%'		return tostring(round(100 * param / total)) .. '%'
	end		end
Line 24:		Line 22:
	local remaining = total - sum		local remaining = total - sum
	if remaining > 0 then		if remaining > 0 then
	return ~~tostring~~(round(100 * remaining / total)~~) .. '%'~~		return percent(remaining, total)
	else		else
	return nil		return nil
Line 47:		Line 45:
	end		end

	function p.~~main~~(~~frame~~)		function p._main(args)
	local args = getArgs(frame)
	return p._main(args, frame)
⚫	end

⚫	function p.~~_main~~(~~args,~~ frame)
	-- frame needs to be available for extensionTag and expandTemplate
	-- TODO: Digest what Johnuniq said on [[WT:Lua]] about the frame.

	local classes = {		local classes = {
Line 88:		Line 79:
	else		else
	for i, class in ipairs(classes) do		for i, class in ipairs(classes) do
	-- 'or class.count' to keep us safe from a ~~non-numeric value in args.~~		-- 'or class.count' to keep us safe from nil arg
	class.count = tonumber(args[i]) or class.count		class.count = tonumber(args[i]) or class.count
	sum_classes = sum_classes + class.count		sum_classes = sum_classes + class.count
Line 109:		Line 100:
	root:addClass('progression-rainbow')		root:addClass('progression-rainbow')

			local current_frame = mw.getCurrentFrame()
	for _, class in ipairs(classes) do		for _, class in ipairs(classes) do
	if class.count ~= 0 then		if class.count ~= 0 then
	local percentage = ~~class_percent~~(class.count, total)		local percentage = percent(class.count, total)
	root:newline() -- sprinkled through to make the HTML easier to read		root:newline() -- sprinkled through to make the HTML easier to read
	root:tag('li')		root:tag('li')
	:css('background', ~~frame~~:expandTemplate{		:css('background', current_frame:expandTemplate{
	title = 'class/colour', args = { class.class }		title = 'class/colour', args = { class.class }
	})		})
	:css('width', percentage)		:css('width', percentage)
	:tag('span')		:tag('span')
			:addClass('sr-only')
	-- wikitext accessibly-hidden by CSS
	:wikitext(string.format('%s %s', percentage, class.category))		:wikitext(string.format('%s %s', percentage, class.category))
	:done()		:done()
	:done()		:done()
	end		end
	end		end
Line 130:		Line 122:
	if remaining then		if remaining then
	root:tag('li')		root:tag('li')
	:addClass('remaining')		:addClass('remaining')
	:css('width', remaining)		:css('width', remaining)
	:tag('span')		:tag('span')
	:wikitext(string.format('%s remaining', remaining))		:addClass('sr-only')
			:wikitext(string.format('%s remaining', remaining))
	:done()		:done()
	:done()		:done()
	:newline()		:newline()
	end		end
	root:allDone() ~~-- close all the things?~~		root:allDone()
	return ~~frame~~:extensionTag{		return current_frame:extensionTag{
	name = 'templatestyles',		name = 'templatestyles', args = { src = 'Module:Progression rainbow/styles.css'}
			} .. current_frame:extensionTag{
	args = { src = 'Module:Progression rainbow/styles.css'}
			name = 'templatestyles', args = { src = 'Screen reader-only/styles.css'}
	} .. '\n' .. tostring(root)		} .. '\n' .. tostring(root)
		⚫	end

		⚫	function p.main(frame)
		⚫	return p._main(require('Module:Arguments').getArgs(frame))
	end		end

Plastikspork: Fix?

2020-12-29T15:35:30Z

Fix?

← Previous revision		Revision as of 15:35, 29 December 2020
Line 141:		Line 141:
	return frame:extensionTag{		return frame:extensionTag{
	name = 'templatestyles',		name = 'templatestyles',
	args = { src = 'Progression rainbow/styles.css'}		args = { src = 'Module:Progression rainbow/styles.css'}
	} .. '\n' .. tostring(root)		} .. '\n' .. tostring(root)
	end		end

Izno: a list feels better

2020-11-06T20:55:32Z

a list feels better

← Previous revision		Revision as of 20:55, 6 November 2020
Line 106:		Line 106:
	end		end

	local root = mw.html.create('~~div~~')		local root = mw.html.create('ul')
	root:addClass('progression-rainbow')		root:addClass('progression-rainbow')

Line 113:		Line 113:
	local percentage = class_percent(class.count, total)		local percentage = class_percent(class.count, total)
	root:newline() -- sprinkled through to make the HTML easier to read		root:newline() -- sprinkled through to make the HTML easier to read
	root:tag('~~div~~')		root:tag('li')
	:css('background', frame:expandTemplate{		:css('background', frame:expandTemplate{
	title = 'class/colour', args = { class.class }		title = 'class/colour', args = { class.class }
Line 129:		Line 129:
	local remaining = percent_remaining(sum_classes, total)		local remaining = percent_remaining(sum_classes, total)
	if remaining then		if remaining then
	root:tag('~~div~~')		root:tag('li')
	:addClass('remaining')		:addClass('remaining')
	:css('width', remaining)		:css('width', remaining)

Izno: swap to divs

2020-11-06T19:11:30Z

swap to divs

← Previous revision		Revision as of 19:11, 6 November 2020
Line 106:		Line 106:
	end		end

	local root = mw.html.create('~~table~~')		local root = mw.html.create('div')
	root:addClass('progression-rainbow')		root:addClass('progression-rainbow')
	:attr('role', 'presentation')
	:tag('tr')
	:addClass('progression-rainbow-mystery')
	-- We add a tr here. MediaWiki (Remex we think) adds a second. One of
	-- them becomes <tr class='mw-empty-elt'></tr>. Removing this one
	-- results in only

	for _, class in ipairs(classes) do		for _, class in ipairs(classes) do
	if class.count ~= 0 then		if class.count ~= 0 then
	local percentage = class_percent(class.count, total)		local percentage = class_percent(class.count, total)
	-- tr problem is unrelated to this newline()
	root:newline() -- sprinkled through to make the HTML easier to read		root:newline() -- sprinkled through to make the HTML easier to read
	root:tag('td')		root:tag('div')
	:css('background', frame:expandTemplate{		:css('background', frame:expandTemplate{
	title = 'class/colour', args = { class.class }		title = 'class/colour', args = { class.class }
Line 136:		Line 129:
	local remaining = percent_remaining(sum_classes, total)		local remaining = percent_remaining(sum_classes, total)
	if remaining then		if remaining then
	root:tag('td')		root:tag('div')
	:addClass('remaining')		:addClass('remaining')
	:css('width', remaining)		:css('width', remaining)

Izno: all done

2020-11-06T19:05:22Z

all done

← Previous revision		Revision as of 19:05, 6 November 2020
Line 145:		Line 145:
	:newline()		:newline()
	end		end
	root:~~done~~() -- close the tr?		root:allDone() -- close all the things?
	return frame:extensionTag{		return frame:extensionTag{
	name = 'templatestyles',		name = 'templatestyles',

Izno: add a done at the end?

2020-11-06T19:02:13Z

add a done at the end?

← Previous revision		Revision as of 19:02, 6 November 2020
Line 145:		Line 145:
	:newline()		:newline()
	end		end
			root:done() -- close the tr?
	return frame:extensionTag{		return frame:extensionTag{
	name = 'templatestyles',		name = 'templatestyles',

Izno: Undid revision 987391534 by Izno (talk) no difference

2020-11-06T18:53:49Z

Undid revision 987391534 by Izno (talk) no difference

← Previous revision		Revision as of 18:53, 6 November 2020
Line 120:		Line 120:
	-- tr problem is unrelated to this newline()		-- tr problem is unrelated to this newline()
	root:newline() -- sprinkled through to make the HTML easier to read		root:newline() -- sprinkled through to make the HTML easier to read
	root:tag('th')		root:tag('td')
	:css('background', frame:expandTemplate{		:css('background', frame:expandTemplate{
	title = 'class/colour', args = { class.class }		title = 'class/colour', args = { class.class }