Module:Adjacent stations/sandbox - Revision history

Jonesey95: sync with live template

2024-10-04T15:06:23Z

sync with live template

← Previous revision		Revision as of 15:06, 4 October 2024
Line 462:		Line 462:

	if not inline then -- [[Template:Legend]]		if not inline then -- [[Template:Legend]]
	result = '<div class="legend" style="page-break-inside:avoid;break-inside:avoid-column"><span class="legend-color" style="display:inline-block;min-width:1.25em;height:1.25em;line-height:1.25;margin:1px 0;border:1px solid black;background-color:#' .. color .. '"> </span> ' .. line .. result .. '</div>'		result = '<div class="legend" style="page-break-inside:avoid;break-inside:avoid-column"><span class="legend-color" style="display:inline-block;min-width:1.25em;height:1.25em;line-height:1.25;margin:1px 0;border:1px solid black;color:inherit;background-color:#' .. color .. '"> </span> ' .. line .. result .. '</div>'
	elseif inline == 'yes' then		elseif inline == 'yes' then
	result = '<span style="background-color:#' .. color .. ';border:1px solid #000"> </span> ' .. line .. result		result = '<span style="color:inherit;background-color:#' .. color .. ';border:1px solid #000"> </span> ' .. line .. result
	elseif inline == 'box' then		elseif inline == 'box' then
	result = '<span style="background-color:#' .. color .. ';border:1px solid #000"> </span>' .. result		result = '<span style="color:inherit;background-color:#' .. color .. ';border:1px solid #000"> </span>' .. result
	elseif inline == 'link' then		elseif inline == 'link' then
	local link = args.link or mw.ustring.match(line, '%[%[([^%[:\|%]]+)[\|%]]')		local link = args.link or mw.ustring.match(line, '%[%[([^%[:\|%]]+)[\|%]]')
	if link then		if link then
	result = '[[' .. link .. '\|<span style="background-color:#' .. color .. ';border:1px solid #000"> </span>]]' .. result		result = '[[' .. link .. '\|<span style="color:inherit;background-color:#' .. color .. ';border:1px solid #000"> </span>]]' .. result
	else		else
	result = '<span style="background-color:#' .. color .. ';border:1px solid #000"> </span>' .. result		result = '<span style="color:inherit;background-color:#' .. color .. ';border:1px solid #000"> </span>' .. result
	end		end
	elseif inline == 'square' then		elseif inline == 'square' then
Line 493:		Line 493:
	end		end
	elseif inline == 'small' then		elseif inline == 'small' then
	result = '<span style="background-color:#' .. color .. '"> </span>' .. ' ' .. line .. result		result = '<span style="color:inherit;background-color:#' .. color .. '"> </span>' .. ' ' .. line .. result
	else		else
	local yesno = require("Module:Yesno")		local yesno = require("Module:Yesno")

Jonesey95: sync with live template; address some dark mode color specifications

2024-10-04T14:54:41Z

sync with live template; address some dark mode color specifications

← Previous revision		Revision as of 14:54, 4 October 2024
Line 526:		Line 526:
	if inline == 'route' then -- [[Template:RouteBox]]		if inline == 'route' then -- [[Template:RouteBox]]
	if link then		if link then
	result = '<span style="background-color:#' .. color .. ';border:.075em solid #' .. border_color .. ';padding:0 .3em">[[' .. link .. '\|<span style="color:' .. text_color .. bold .. ';font-size:inherit;white-space:nowrap">' .. lineN .. '</span>]]</span>'		result = '<span style="color:inherit;background-color:#' .. color .. ';border:.075em solid #' .. border_color .. ';padding:0 .3em">[[' .. link .. '\|<span style="color:' .. text_color .. bold .. ';font-size:inherit;white-space:nowrap">' .. lineN .. '</span>]]</span>'
	else		else
	result = '<span style="background-color:#' .. color .. ';border:.075em solid #' .. border_color .. ';padding:0 .3em;color:' .. text_color .. bold .. ';font-size:inherit;white-space:nowrap">' .. lineN .. '</span>'		result = '<span style="background-color:#' .. color .. ';border:.075em solid #' .. border_color .. ';padding:0 .3em;color:' .. text_color .. bold .. ';font-size:inherit;white-space:nowrap">' .. lineN .. '</span>'
Line 532:		Line 532:
	elseif inline == 'croute' then -- [[Template:Bahnlinie]]		elseif inline == 'croute' then -- [[Template:Bahnlinie]]
	if link then		if link then
	result = '<span style="background-color:#' .. color .. ';border:.075em solid #' .. border_color .. ';border-radius:.5em;padding:0 .3em">[[' .. link .. '\|<span style="color:' .. text_color .. bold .. ';font-size:inherit;white-space:nowrap">' .. lineN .. '</span>]]</span>'		result = '<span style="color:inherit;background-color:#' .. color .. ';border:.075em solid #' .. border_color .. ';border-radius:.5em;padding:0 .3em">[[' .. link .. '\|<span style="color:' .. text_color .. bold .. ';font-size:inherit;white-space:nowrap">' .. lineN .. '</span>]]</span>'
	else		else
	result = '<span style="background-color:#' .. color .. ';border:.075em solid #' .. border_color .. ';border-radius:.5em;padding:0 .3em;color:' .. text_color .. bold .. ';font-size:inherit;white-space:nowrap">' .. lineN .. '</span>'		result = '<span style="color:inherit;background-color:#' .. color .. ';border:.075em solid #' .. border_color .. ';border-radius:.5em;padding:0 .3em;color:' .. text_color .. bold .. ';font-size:inherit;white-space:nowrap">' .. lineN .. '</span>'
	end		end
	elseif inline == 'xroute' then -- [[Template:Bahnlinie]]		elseif inline == 'xroute' then -- [[Template:Bahnlinie]]
Line 544:		Line 544:
	elseif inline == 'broute' then		elseif inline == 'broute' then
	if link then		if link then
	result = '<span style="background-color:#' .. color .. ';border:.075em solid #000;padding:0 .3em">[[' .. link .. '\|<span style="color:' .. text_color .. bold .. ';font-size:inherit;white-space:nowrap">' .. lineN .. '</span>]]</span>'		result = '<span style="color:inherit;background-color:#' .. color .. ';border:.075em solid #000;padding:0 .3em">[[' .. link .. '\|<span style="color:' .. text_color .. bold .. ';font-size:inherit;white-space:nowrap">' .. lineN .. '</span>]]</span>'
	else		else
	result = '<span style="background-color:#' .. color .. ';border:.075em solid #000;padding:0 .3em;color:' .. text_color .. bold .. ';font-size:inherit;white-space:nowrap">' .. lineN .. '</span>'		result = '<span style="background-color:#' .. color .. ';border:.075em solid #000;padding:0 .3em;color:' .. text_color .. bold .. ';font-size:inherit;white-space:nowrap">' .. lineN .. '</span>'
	end		end
	else -- [[Template:Legend]] (fallback; duplication to simplify logic)		else -- [[Template:Legend]] (fallback; duplication to simplify logic)
	result = '<div class="legend" style="page-break-inside:avoid;break-inside:avoid-column"><span class="legend-color" style="display:inline-block;min-width:1.25em;height:1.25em;line-height:1.25;margin:1px 0;border:1px solid black;background-color:#' .. color .. '"> </span> ' .. line .. result .. '</div>'		result = '<div class="legend" style="page-break-inside:avoid;break-inside:avoid-column"><span class="legend-color" style="display:inline-block;min-width:1.25em;height:1.25em;line-height:1.25;margin:1px 0;border:1px solid black;color:inherit;background-color:#' .. color .. '"> </span> ' .. line .. result .. '</div>'
	end		end
	end		end
Line 675:		Line 675:

	p.icon = makeInvokeFunction('_icon')		p.icon = makeInvokeFunction('_icon')
			p['rail icon'] = makeTemplateFunction('_icon')

	function p._line(args, frame)		function p._line(args, frame)

Ahecht: makeTemplateFunction

2024-09-30T18:33:29Z

makeTemplateFunction

← Previous revision		Revision as of 18:33, 30 September 2024
Line 390:		Line 390:
	return function (frame)		return function (frame)
	local args = getArgs(frame, {parentOnly = true})		local args = getArgs(frame, {parentOnly = true})
			return p[funcName](args, frame)
			end
			end

			local function makeTemplateFunction(funcName)
			-- makes a function that can be returned from #invoke, using
			-- [[Module:Arguments]]
			return function (frame)
			local args = getArgs(frame, {frameOnly = true})
	return p[funcName](args, frame)		return p[funcName](args, frame)
	end		end
Line 794:		Line 803:

	p.station = makeInvokeFunction('_station')		p.station = makeInvokeFunction('_station')
			p['station link'] = makeTemplateFunction('_station')

	function p._terminusTable(args, frame)		function p._terminusTable(args, frame)

Ahecht: sync

2024-09-30T18:32:00Z

sync

@@ Line 237: / Line 237: @@
 			local line = data[v]['lines'] and (mw.clone(data[v]['lines'][lineN]) or error(i18n[lang]['error_unknown'](args[v]['line']))) or error(i18n[lang]['error_line'])
 			local default = data[v]['lines']['_default'] or {}
-			line['title'] = line['title'] or default['title']
+			line['title'] = line['title'] or default['title'] or ''
 			line['title'] = mw.ustring.gsub(line['title'], '%%1', lineN)
@@ Line 843: / Line 843: @@
 	local result = {}
 	local data = args.data
 	if system or data then
 		data = data or getData(system, true)
@@ Line 861: / Line 858: @@
 		end
-		if style == 'header' or style == 'subheader' then
+		if style == 'header' then
-			if style == 'header' then
+		elseif style == 'subheader' then
-				nameFormat = data['name format'] and getValue(data['name format'])
+			local tmp = data['header background color'] and getValue(data['header background color'])
-				if nameFormat then
+			if tmp then
 				else
 					local greatercontrast = require('Module:Color contrast')._greatercontrast
-					color = greatercontrast{background}
+					if greatercontrast{tmp} == '#FFFFFF' then table.insert(result, 'color:#FFFFFF') end
 				end
 			end
 		end
 		result = table.concat(result, ';')
@@ Line 936: / Line 908: @@
 			result = table.concat(result, ';')
 		else
 		end
 	else
 	end

Taavi: color: inherit

2024-09-29T13:56:11Z

color: inherit

← Previous revision		Revision as of 13:56, 29 September 2024
Line 863:		Line 863:
	if style == 'header' or style == 'subheader' then		if style == 'header' or style == 'subheader' then
	local nameFormat = ''		local nameFormat = ''
			local useBackground = true
	if style == 'header' then		if style == 'header' then
	nameFormat = data['name format'] and getValue(data['name format'])		nameFormat = data['name format'] and getValue(data['name format'])
	if nameFormat then		if nameFormat then
			-- HACK for dark mode support
	-- HACK: replace 'background-color: transparent;' present in many configurations
		⚫	if mw.ustring.match( nameFormat, '(background%-?c?o?l?o?r?: ?)transparent(;?)' ) then
	-- with default infobox bg color in dark mode as we also set a black color below
			useBackground = false
⚫	~~nameFormat =~~ mw.ustring.~~gsub~~( nameFormat, '(background%-?c?o?l?o?r?: ?)transparent(;?)', ~~'%1#f8f9fa%2'~~ )
			nameFormat = mw.ustring.gsub( nameFormat, '(background%-?c?o?l?o?r?: ?)transparent(;?)', '' )
			nameFormat = mw.ustring.gsub( nameFormat, 'color: ?black(;?)', 'color: inherit%1' )
		⚫	end

	table.insert(result, nameFormat)		table.insert(result, nameFormat)
	end		end
Line 874:		Line 879:

	local background = ''		local background = ''
	if not mw.ustring.match( nameFormat, 'background' ) then		if not mw.ustring.match( nameFormat, 'background' ) and useBackground then
	if data['header background color'] then		if data['header background color'] then
	background = '#' .. getValue(data['header background color'])		background = '#' .. getValue(data['header background color'])
Line 891:		Line 896:
	local greatercontrast = require('Module:Color contrast')._greatercontrast		local greatercontrast = require('Module:Color contrast')._greatercontrast
	color = greatercontrast{background}		color = greatercontrast{background}
⚫	end

	if color == '' then color = '#ffffff' end		if color == '' then color = '#ffffff' end
			else
			color = 'inherit'
			end
	end		end

Taavi at 13:23, 29 September 2024

2024-09-29T13:23:22Z

← Previous revision		Revision as of 13:23, 29 September 2024
Line 865:		Line 865:
	if style == 'header' then		if style == 'header' then
	nameFormat = data['name format'] and getValue(data['name format'])		nameFormat = data['name format'] and getValue(data['name format'])
	if nameFormat then ~~table.insert(result, nameFormat) end~~		if nameFormat then
			-- HACK: replace 'background-color: transparent;' present in many configurations
			-- with default infobox bg color in dark mode as we also set a black color below
			nameFormat = mw.ustring.gsub( nameFormat, '(background%-?c?o?l?o?r?: ?)transparent(;?)', '%1#f8f9fa%2' )
		⚫	table.insert(result, nameFormat)
			end
	end		end

Line 871:		Line 876:
	if not mw.ustring.match( nameFormat, 'background' ) then		if not mw.ustring.match( nameFormat, 'background' ) then
	if data['header background color'] then		if data['header background color'] then
	background = getValue(data['header background color'])		background = '#' .. getValue(data['header background color'])
			elseif style ~= 'header' then
			background = '#efefef'
	else		else
	background = '~~efefef~~'		background = '#f8f9fa'
	end		end

⚫	table.insert(result, 'background-color:#' .. background)
	end		end

		⚫	local color = ''
	if not ( mw.ustring.match( nameFormat, '^color' ) or mw.ustring.match( nameFormat, ' color' ) or mw.ustring.match( nameFormat, ';color' ) ) then		if not ( mw.ustring.match( nameFormat, '^color' ) or mw.ustring.match( nameFormat, ' color' ) or mw.ustring.match( nameFormat, ';color' ) ) then
⚫	local color = ''
	if data['header text color'] then		if data['header text color'] then
	color = '#' .. getValue(data['header text color'])		color = '#' .. getValue(data['header text color'])
Line 889:		Line 894:

	if color == '' then color = '#ffffff' end		if color == '' then color = '#ffffff' end
⚫	table.insert(result, ~~'color:' .. color~~)
	end		end

		⚫	if background ~= '' then table.insert(result, 'background-color:' .. background) end
			if color ~= '' then table.insert(result, 'color:' .. color) end
	end		end
	result = table.concat(result, ';')		result = table.concat(result, ';')

Taavi: fix color from _greatercontrast

2024-09-29T10:24:37Z

fix color from _greatercontrast

← Previous revision		Revision as of 10:24, 29 September 2024
Line 882:		Line 882:
	local color = ''		local color = ''
	if data['header text color'] then		if data['header text color'] then
	color = getValue(data['header text color'])		color = '#' .. getValue(data['header text color'])
	elseif background ~= '' then		elseif background ~= '' then
	local greatercontrast = require('Module:Color contrast')._greatercontrast		local greatercontrast = require('Module:Color contrast')._greatercontrast
Line 888:		Line 888:
	end		end

	if color == '' then color = 'ffffff' end		if color == '' then color = '#ffffff' end
	table.insert(result, 'color:#' .. color)		table.insert(result, 'color:' .. color)
	end		end
	end		end

Taavi: fix default colors

2024-09-29T10:22:48Z

fix default colors

← Previous revision		Revision as of 10:22, 29 September 2024
Line 873:		Line 873:
	background = getValue(data['header background color'])		background = getValue(data['header background color'])
	else		else
	background = '#efefef'		background = 'efefef'
	end		end

Line 888:		Line 888:
	end		end

	if color == '' then color = '#ffffff' end		if color == '' then color = 'ffffff' end
	table.insert(result, 'color:#' .. color)		table.insert(result, 'color:#' .. color)
	end		end

Taavi: fix variable use

2024-09-29T10:21:49Z

fix variable use

← Previous revision		Revision as of 10:21, 29 September 2024
Line 865:		Line 865:
	if style == 'header' then		if style == 'header' then
	nameFormat = data['name format'] and getValue(data['name format'])		nameFormat = data['name format'] and getValue(data['name format'])
	if nameFormat then table.insert(result, ~~tmp~~) end		if nameFormat then table.insert(result, nameFormat) end
	end		end

			local background = ''
	if not mw.ustring.match( nameFormat, 'background' ) then		if not mw.ustring.match( nameFormat, 'background' ) then
	~~local background =~~ data['header background color'] ~~and~~ getValue(data['header background color'])		if data['header background color'] then
			background = getValue(data['header background color'])
		⚫	else
	~~if not background then~~ background = '#efefef' ~~end~~		background = '#efefef'
			end

	table.insert(result, 'background-color:#' .. background)		table.insert(result, 'background-color:#' .. background)
	end		end
Line 878:		Line 883:
	if data['header text color'] then		if data['header text color'] then
	color = getValue(data['header text color'])		color = getValue(data['header text color'])
			elseif background ~= '' then
⚫	else
	local greatercontrast = require('Module:Color contrast')._greatercontrast		local greatercontrast = require('Module:Color contrast')._greatercontrast
	color = greatercontrast{~~tmp~~}		color = greatercontrast{background}
	end		end

Taavi: fix

2024-09-29T10:18:30Z

fix

← Previous revision		Revision as of 10:18, 29 September 2024
Line 845:		Line 845:

	local default = 'background-color:#efefef; color: black;' -- Default background color for {{Infobox station}}		local default = 'background-color:#efefef; color: black;' -- Default background color for {{Infobox station}}
	if style ~= 'subheader' then ~~result~~ = 'color: inherit' end -- Workaround .notheme setting black text color		if style ~= 'subheader' then default = 'color: inherit' end -- Workaround .notheme setting black text color

	if system or data then		if system or data then