Module:Solar eclipse - Revision history

Grapesoda22: Undid revision 1283027027 by Grapesoda22 (talk)

2025-03-30T00:29:24Z

← Previous revision		Revision as of 00:29, 30 March 2025
Line 184:		Line 184:

	local eclipse_types = {		local eclipse_types = {
	total = { label = "'''~~[[#Solar eclipse#Total eclipse\|~~Total eclipse]]'''", color = "#690005" },		total = { label = "'''Total eclipse'''", color = "#690005" },
	partial = { label = "'''~~[[#Solar eclipse#Partial eclipse\|~~Partial eclipse]]'''", color = "#854739" },		partial = { label = "'''Partial eclipse'''", color = "#854739" },
	annular = { label = "'''~~[[#Solar eclipse#Annular eclipse\|~~Annular eclipse]]'''", color = "#4C4CB1" },		annular = { label = "'''Annular eclipse'''", color = "#4C4CB1" },
	hybrid = { label = "'''~~[[Solar eclipse#Hybrid eclipse\|~~Hybrid eclipse]]'''", color = "#006600" }		hybrid = { label = "'''Hybrid eclipse'''", color = "#006600" }
	}		}

2025-03-30T00:28:57Z

← Previous revision		Revision as of 00:28, 30 March 2025
Line 184:		Line 184:

	local eclipse_types = {		local eclipse_types = {
	total = { label = "'''Total eclipse'''", color = "#690005" },		total = { label = "'''[[#Solar eclipse#Total eclipse\|Total eclipse]]'''", color = "#690005" },
	partial = { label = "'''Partial eclipse'''", color = "#854739" },		partial = { label = "'''[[#Solar eclipse#Partial eclipse\|Partial eclipse]]'''", color = "#854739" },
	annular = { label = "'''Annular eclipse'''", color = "#4C4CB1" },		annular = { label = "'''[[#Solar eclipse#Annular eclipse\|Annular eclipse]]'''", color = "#4C4CB1" },
	hybrid = { label = "'''Hybrid eclipse'''", color = "#006600" }		hybrid = { label = "'''[[Solar eclipse#Hybrid eclipse\|Hybrid eclipse]]'''", color = "#006600" }
	}		}

2025-03-30T00:23:41Z

← Previous revision		Revision as of 00:23, 30 March 2025
Line 184:		Line 184:

	local eclipse_types = {		local eclipse_types = {
	total = { label = "Total eclipse", color = "#690005" },		total = { label = "'''Total eclipse'''", color = "#690005" },
	partial = { label = "Partial eclipse", color = "#854739" },		partial = { label = "'''Partial eclipse'''", color = "#854739" },
	annular = { label = "Annular eclipse", color = "#4C4CB1" },		annular = { label = "'''Annular eclipse'''", color = "#4C4CB1" },
	hybrid = { label = "Hybrid eclipse", color = "#006600" }		hybrid = { label = "'''Hybrid eclipse'''", color = "#006600" }
	}		}

2025-03-30T00:17:46Z

Slight tweaks to accommodate WP:COLOR

← Previous revision		Revision as of 00:17, 30 March 2025
Line 185:		Line 185:
	local eclipse_types = {		local eclipse_types = {
	total = { label = "Total eclipse", color = "#690005" },		total = { label = "Total eclipse", color = "#690005" },
	partial = { label = "Partial eclipse", color = "#~~c56b55~~" },		partial = { label = "Partial eclipse", color = "#854739" },
	annular = { label = "Annular eclipse", color = "#~~5555c5~~" },		annular = { label = "Annular eclipse", color = "#4C4CB1" },
	hybrid = { label = "Hybrid eclipse", color = "#~~55c555~~" }		hybrid = { label = "Hybrid eclipse", color = "#006600" }
	}		}

2025-02-13T01:57:22Z

Moving content from sandbox per discussion with Weatherman4064

2024-03-06T06:26:34Z

minutes as well ("m" means "metre")

← Previous revision		Revision as of 06:26, 6 March 2024
Line 72:		Line 72:
	if( min and sec ) then		if( min and sec ) then
	return tostring(tonumber(min)*60 + tonumber(sec)) .. ' s' ..		return tostring(tonumber(min)*60 + tonumber(sec)) .. ' s' ..
	' (' .. min .. ' m ' .. sec .. ' s)'		' (' .. min .. ' min ' .. sec .. ' s)'
	end		end
	end		end

2024-03-06T06:24:15Z

MOS:UNITSYMBOLS: either "second(s)" (unit name) or "s" (unit symbol); "sec" is nonsense

← Previous revision		Revision as of 06:24, 6 March 2024
Line 71:		Line 71:
	local sec = s:match('^%s%d+m%s(%d+)s%s*$')		local sec = s:match('^%s%d+m%s(%d+)s%s*$')
	if( min and sec ) then		if( min and sec ) then
	return tostring(tonumber(min)*60 + tonumber(sec)) .. ' ~~sec~~' ..		return tostring(tonumber(min)*60 + tonumber(sec)) .. ' s' ..
	' (' .. min .. ' m ' .. sec .. ' s)'		' (' .. min .. ' m ' .. sec .. ' s)'
	end		end

2023-10-23T20:47:22Z

apply infoboximage to map as well

@@ Line 3: / Line 3: @@
 local data_module_prefix = "Module:Solar eclipse/db/"
 local function ifnotempty(s,a,b)
@@ Line 124: / Line 140: @@
 	local mapstr = ifnotempty(args['map'],
 		"<div style='padding-bottom:0.5em;'>" ..
-		(args['map'] or '') .. ifnotempty(args['map_caption'],
+		(InfoboxImage(args['map']) or '') .. ifnotempty(args['map_caption'],
 			"<div style='line-height:1.2em; padding-top:0.1em;'>" ..
 			(args['map_caption'] or '') .. "</div>", '') .. '</div>')
@@ Line 135: / Line 151: @@
 		["abovestyle"] = "padding-bottom:0.25em; background:" .. bgcolor .. "; line-height:1.2em; text-align:center; font-size:115%;",
 ------------------ Images and maps ------------------
-		["image"] = ifnotempty(args['image'],
+		["image"] = InfoboxImage(args['image']),
 		["imagestyle"] = "padding-bottom:0.5em;",
 		["caption"] = args['caption'] or '',

2023-10-20T17:40:09Z

InfoboxImage

← Previous revision		Revision as of 17:40, 20 October 2023
Line 135:		Line 135:
	["abovestyle"] = "padding-bottom:0.25em; background:" .. bgcolor .. "; line-height:1.2em; text-align:center; font-size:115%;",		["abovestyle"] = "padding-bottom:0.25em; background:" .. bgcolor .. "; line-height:1.2em; text-align:center; font-size:115%;",
	------------------ Images and maps ------------------		------------------ Images and maps ------------------
	["image"] = args['image'] ~~or ''~~,		["image"] = ifnotempty(args['image'],
			require('Module:InfoboxImage').InfoboxImage{args = {
			image = args['image'] or '',
			size = '320px',
			sizedefault = 'frameless',
			upright = 1
			}}, ''),
	["imagestyle"] = "padding-bottom:0.5em;",		["imagestyle"] = "padding-bottom:0.5em;",
	["caption"] = args['caption'] or '',		["caption"] = args['caption'] or '',

2023-07-31T16:50:12Z

publishing from sandbox new code written by Frietjes to address MOS:NEGATIVE violations as discussed here

← Previous revision		Revision as of 16:50, 31 July 2023
Line 52:		Line 52:
	local function parsetime(s)		local function parsetime(s)
	if(s and s ~= '') then		if(s and s ~= '') then
	local min = s:match('^%s([%d][%d])m%s[%d][%d]s%s*$')		local min = s:match('^%s(%d+)m%s%d+s%s*$')
	local sec = s:match('^%s[%d][%d]m%s([%d][%d])s%s*$')		local sec = s:match('^%s%d+m%s(%d+)s%s*$')
	if( min and sec ) then		if( min and sec ) then
	return tostring(tonumber(min)*60 + tonumber(sec)) .. ' sec' ..		return tostring(tonumber(min)*60 + tonumber(sec)) .. ' sec' ..
Line 74:		Line 74:

	local function loadsolardb(frame, s)		local function loadsolardb(frame, s)
	local yearstr = s:match('^%s([%d][%d][%d][%d])[A-Z][a-z][a-z][%d][%d]%s$') or ''		local yearstr = s:match('^%s(%d%d%d%d)[A-Z][a-z][a-z]%d%d%s$') or ''
	local function setarg(k, v)		local function setarg(k, v)
	if(v and v ~= '') then ~~args[k] = v end~~		if(v and v ~= '') then
			v = mw.ustring.gsub(v, '^%s*%-(%d)', '−%1')
			args[k] = v
			end
	end		end
	if( yearstr ~= '' ) then		if( yearstr ~= '' ) then