Module:Political party/testtable - Revision history

Paine Ellsworth: sp.

2022-11-28T07:18:00Z

sp.

← Previous revision		Revision as of 07:18, 28 November 2022
Line 158:		Line 158:
	row:tag('th')		row:tag('th')
	:attr('scope', 'col')		:attr('scope', 'col')
	:wikitext('Contrast ~~unvisted~~ link')		:wikitext('Contrast unvisited link')
	row:tag('th')		row:tag('th')
	:attr('scope', 'col')		:attr('scope', 'col')
	:wikitext('Contrast ~~visted~~ link')		:wikitext('Contrast visited link')

	for party_name, party_vals in orderedPairs(data.full) do		for party_name, party_vals in orderedPairs(data.full) do

Gonnym: on the /doc it can use require as its only 1 call on the page

2021-12-15T15:15:10Z

on the /doc it can use require as its only 1 call on the page

← Previous revision		Revision as of 15:15, 15 December 2021
Line 100:		Line 100:

	-- Load data from submodule		-- Load data from submodule
	local data = ~~mw.loadData~~('Module:Political party/' .. index)		local data = require('Module:Political party/' .. index)

	-- helper function		-- helper function

Gonnym: ordered code taken from http://lua-users.org/wiki/SortedIteration

2021-12-15T14:51:32Z

ordered code taken from http://lua-users.org/wiki/SortedIteration

@@ Line 2: / Line 2: @@
 local contrastRatio = require('Module:Color contrast')._ratio
 local function isContrastValid(text, background)
@@ Line 59: / Line 101: @@
 	-- Load data from submodule
 	local data = mw.loadData('Module:Political party/' .. index)
 	-- helper function
 	local function table_row(party_name, party_info)
@@ Line 121: / Line 163: @@
 		:wikitext('Contrast visted link')
-	for party_name, party_vals in pairs(data.full) do
+	for party_name, party_vals in orderedPairs(data.full) do
 		row = root:tag('tr')
 		row:wikitext(table_row(party_name, party_vals))

Gonnym at 08:44, 26 November 2021

2021-11-26T08:44:30Z

← Previous revision		Revision as of 08:44, 26 November 2021
Line 33:		Line 33:
	if HTMLcolor[color] then		if HTMLcolor[color] then
	return ''		return ''
			end

			-- Added as a valid color in https://www.w3.org/TR/css-color-3/#transparent
			if color == "transparent" then
			return ""
	end		end

Gonnym: added color accessibility validation

2021-11-19T15:06:06Z

added color accessibility validation

← Previous revision		Revision as of 15:06, 19 November 2021
Line 1:		Line 1:
	local p = {}		local p = {}

			local contrastRatio = require('Module:Color contrast')._ratio

			local function isContrastValid(text, background)
			if not background or background == "" then
			return ''
			end

			local ratio = tonumber(contrastRatio({text, background}))
			if not ratio then
			return ""
			end
			if ratio > 4.5 and ratio < 7.0 then
			return "AA"
			elseif ratio > 7.0 then
			return "AAA"
			else
			return "Failed"
			end
			end

	local function isColorValid(color)		local function isColorValid(color)
	if not color or color == "" then		if not color or color == "" then
	return		return ''
	end		end

Line 12:		Line 32:
	local HTMLcolor = mw.loadData('Module:Color contrast/colors')		local HTMLcolor = mw.loadData('Module:Color contrast/colors')
	if HTMLcolor[color] then		if HTMLcolor[color] then
	return		return ''
	end		end

Line 20:		Line 40:
	local cs = mw.text.split(color, '')		local cs = mw.text.split(color, '')
	if #cs == 6 or #cs == 3 then		if #cs == 6 or #cs == 3 then
	return		return ''
	end		end


			return false
	mw.log(color)
	return "" -- TODO: return an error.
	end		end

Line 39:		Line 58:
	local function table_row(party_name, party_info)		local function table_row(party_name, party_info)
	local res = mw.html.create('')		local res = mw.html.create('')
	res:tag('td')		res:tag('th')
			:attr('scope', 'row')
	:wikitext(party_name)		:wikitext(party_name)
	res:tag('td')		res:tag('td')
Line 48:		Line 68:
	res:tag('td')		res:tag('td')
	:wikitext(party_info.shortname)		:wikitext(party_info.shortname)
			res:tag('td')
		⚫	:wikitext(tostring(isColorValid(party_info.color)))
			res:tag('td')
			:wikitext(isContrastValid("black", party_info.color))
			res:tag('td')
			:wikitext(isContrastValid("#0645AD", party_info.color))
			res:tag('td')
			:wikitext(isContrastValid("#0B0080", party_info.color))

	return tostring(res)		return tostring(res)
	end		end
Line 53:		Line 82:
	-- build table		-- build table
	local root = mw.html.create('table')		local root = mw.html.create('table')
	root:addClass('wikitable ~~sortable~~')		root:addClass('wikitable')
			:addClass('sortable')
			:addClass('plainrowheaders')
	:css('background-color', 'transparent')		:css('background-color', 'transparent')
	:css('font-size', '90%')		:css('font-size', '90%')
Line 60:		Line 91:
	local row = root:tag('tr')		local row = root:tag('tr')
	row:tag('th')		row:tag('th')
			:attr('scope', 'col')
	:wikitext('Political party name')		:wikitext('Political party name')
	row:tag('th')		row:tag('th')
			:attr('scope', 'col')
	:addClass('unsortable')		:addClass('unsortable')
	:wikitext('color')		:wikitext('color')
	row:tag('th')		row:tag('th')
			:attr('scope', 'col')
	:wikitext('abbrev')		:wikitext('abbrev')
	row:tag('th')		row:tag('th')
			:attr('scope', 'col')
	:wikitext('shortname')		:wikitext('shortname')
			row:tag('th')
			:attr('scope', 'col')
			:wikitext('Is color valid?')
			row:tag('th')
			:attr('scope', 'col')
			:wikitext('Contrast normal text')
			row:tag('th')
			:attr('scope', 'col')
			:wikitext('Contrast unvisted link')
			row:tag('th')
			:attr('scope', 'col')
			:wikitext('Contrast visted link')

	for party_name, party_vals in pairs(data.full) do		for party_name, party_vals in pairs(data.full) do
⚫	isColorValid(~~party_vals~~.color)
	row = root:tag('tr')		row = root:tag('tr')
	row:wikitext(table_row(party_name, party_vals))		row:wikitext(table_row(party_name, party_vals))

Gonnym: cleaner

2021-11-19T11:16:20Z

cleaner

← Previous revision		Revision as of 11:16, 19 November 2021
Line 3:		Line 3:
	local function isColorValid(color)		local function isColorValid(color)
	if not color or color == "" then		if not color or color == "" then
	mw.log("here")
	return		return
	end		end
Line 12:		Line 11:
	-- Check if color is using an HTML color name.		-- Check if color is using an HTML color name.
	local HTMLcolor = mw.loadData('Module:Color contrast/colors')		local HTMLcolor = mw.loadData('Module:Color contrast/colors')
	~~local color_name =~~ HTMLcolor[color]		if HTMLcolor[color] then
	if color_name then
	return		return
	end		end

Gonnym at 11:15, 19 November 2021

2021-11-19T11:15:11Z

← Previous revision		Revision as of 11:15, 19 November 2021
Line 17:		Line 17:
	end		end

	-- ~~remove~~ leading # (if there is one~~) and whitespace~~		-- Remove leading # if there is one.
	color = string.gsub(color, "^#", "")		color = string.gsub(color, "^#", "")

Gonnym: added isColorValid() to validate color input (code adopted from Module:Color contrast). Needs to be shown on page. Maybe also add contrast validation.

2021-11-19T11:14:42Z

added isColorValid() to validate color input (code adopted from Module:Color contrast). Needs to be shown on page. Maybe also add contrast validation.

← Previous revision		Revision as of 11:14, 19 November 2021
Line 1:		Line 1:
	local p = {}		local p = {}

			local function isColorValid(color)
			if not color or color == "" then
			mw.log("here")
			return
			end

			-- Convert to lowercase.
			color = color:lower()

			-- Check if color is using an HTML color name.
			local HTMLcolor = mw.loadData('Module:Color contrast/colors')
			local color_name = HTMLcolor[color]
			if color_name then
			return
			end

			-- remove leading # (if there is one) and whitespace
			color = string.gsub(color, "^#", "")

			local cs = mw.text.split(color, '')
			if #cs == 6 or #cs == 3 then
			return
			end

			mw.log(color)
			return "" -- TODO: return an error.
			end

	-- Example of having all the data - color and names - in one table. Requires one page to be edited instead of two when adding a new party.		-- Example of having all the data - color and names - in one table. Requires one page to be edited instead of two when adding a new party.
Line 11:		Line 39:

	-- helper function		-- helper function
	local function table_row(t, c)		local function table_row(party_name, party_info)
	local res = mw.html.create('')		local res = mw.html.create('')
	res:tag('td')		res:tag('td')
	:wikitext(t)		:wikitext(party_name)
	res:tag('td')		res:tag('td')
	:css('background-color', c.color)		:css('background-color', party_info.color)
	:wikitext(~~c['~~color'])		:wikitext(party_info.color)
	res:tag('td')		res:tag('td')
	:wikitext(c.abbrev)		:wikitext(party_info.abbrev)
	res:tag('td')		res:tag('td')
	:wikitext(c.shortname)		:wikitext(party_info.shortname)
	return tostring(res)		return tostring(res)
	end		end
Line 44:		Line 72:

	for party_name, party_vals in pairs(data.full) do		for party_name, party_vals in pairs(data.full) do
			isColorValid(party_vals.color)
	row = root:tag('tr')		row = root:tag('tr')
	row:wikitext(table_row(party_name, party_vals))		row:wikitext(table_row(party_name, party_vals))

Gonnym: small cleanup

2021-11-19T10:48:00Z

small cleanup

← Previous revision		Revision as of 10:48, 19 November 2021
Line 5:		Line 5:
	-- Initialise and populate variables		-- Initialise and populate variables
	local args = frame.args		local args = frame.args
	local index = args['letter']		local index = args.letter

	-- Load data from submodule		-- Load data from submodule
Line 16:		Line 16:
	:wikitext(t)		:wikitext(t)
	res:tag('td')		res:tag('td')
	:css('background', c['color'])		:css('background-color', c.color)
	:wikitext(c['color'])		:wikitext(c['color'])
	res:tag('td')		res:tag('td')
	:wikitext(c['abbrev'])		:wikitext(c.abbrev)
	res:tag('td')		res:tag('td')
	:wikitext(c['shortname'])		:wikitext(c.shortname)
	return tostring(res)		return tostring(res)
	end		end
Line 28:		Line 28:
	local root = mw.html.create('table')		local root = mw.html.create('table')
	root:addClass('wikitable sortable')		root:addClass('wikitable sortable')
	:css('background', 'transparent')		:css('background-color', 'transparent')
	:css('font-size', '90%')		:css('font-size', '90%')
	:css('line-height', '100%')		:css('line-height', '100%')

Primefac: temporary removal of "unsortable" for a check of something in those fields

2021-10-28T10:55:23Z

temporary removal of "unsortable" for a check of something in those fields

← Previous revision		Revision as of 10:55, 28 October 2021
Line 39:		Line 39:
	:wikitext('color')		:wikitext('color')
	row:tag('th')		row:tag('th')
	:addClass('unsortable')
	:wikitext('abbrev')		:wikitext('abbrev')
	row:tag('th')		row:tag('th')
	:addClass('unsortable')
	:wikitext('shortname')		:wikitext('shortname')