Module:Solar eclipse/sandbox - Revision history

StrawberryMaster: Added support for previous/next in database

2025-02-12T01:22:13Z

Added support for previous/next in database

← Previous revision		Revision as of 01:22, 12 February 2025
Line 154:		Line 154:
	setarg('end_total', dargs['TiTE'])		setarg('end_total', dargs['TiTE'])
	setarg('end_partial', dargs['TiPE'])		setarg('end_partial', dargs['TiPE'])
			setarg('previous', '')
			setarg('next', '')
	end		end
	end		end

StrawberryMaster: Moved header position

2025-02-11T23:22:04Z

Moved header position

← Previous revision		Revision as of 23:22, 11 February 2025
Line 201:		Line 201:
	["bodystyle"] = "width:25em; text-align:left; font-size:88%;",		["bodystyle"] = "width:25em; text-align:left; font-size:88%;",
	["title"] = titlestr,		["title"] = titlestr,
		⚫	["subheader"] = type_header,
	["below"] = belowstr,		["below"] = belowstr,
	["belowstyle"] = "text-align:center; padding-top:0.5em",		["belowstyle"] = "text-align:center; padding-top:0.5em",
Line 210:		Line 211:
	["data1"] = mapstr,		["data1"] = mapstr,
	------------- Type of eclipse and saros -------------		------------- Type of eclipse and saros -------------
⚫	["~~header2~~"] = type_header,
	["label4"] = "[[Gamma (eclipse)\|Gamma]]",		["label4"] = "[[Gamma (eclipse)\|Gamma]]",
	["data4"] = args['gamma'] or '',		["data4"] = args['gamma'] or '',

StrawberryMaster: Cleanup

2025-02-11T22:09:55Z

Cleanup

← Previous revision		Revision as of 22:09, 11 February 2025
Line 30:		Line 30:
	end		end

	local function parsedate(y,m,d)		local function parsedate(y, m, d)
	local lang = mw.language.getContentLanguage()		local lang = mw.language.getContentLanguage()
	d = ~~(tonumber(d)~~ < ~~10)~~ ~~and~~ (~~'0' ..~~ tonumber(d)~~) or (d~~)		d = string.format("%02d", tonumber(d))
	m = ~~(tonumber(m)~~ < ~~10)~~ ~~and~~ (~~'0' ..~~ tonumber(m)~~) or (m~~)		m = string.format("%02d", tonumber(m))
	~~local~~ ~~success,~~ ~~result~~ = ~~pcall(lang.formatDate,~~ ~~lang,~~ ~~'F j, Y',~~ y .. '-' .. m .. '-' .. d)		local date_str = y .. '-' .. m .. '-' .. d
			local success, result = pcall(lang.formatDate, lang, 'F j, Y', date_str)
	return success and result or ~~nil~~		return success and result or date_str
	end		end

Line 179:		Line 180:
	belowstr = string.format('<div style="width:100%%"><div class="noprint" style="text-align:right">%s →</div></div>', nextLink)		belowstr = string.format('<div style="width:100%%"><div class="noprint" style="text-align:right">%s →</div></div>', nextLink)
	end		end

			local eclipse_types = {
			total = { label = "Total eclipse", color = "#690005" },
			partial = { label = "Partial eclipse", color = "#c56b55" },
			annular = { label = "Annular eclipse", color = "#5555c5" },
			hybrid = { label = "Hybrid eclipse", color = "#55c555" }
			}

	local nature = args['nature'] and args['nature']:lower() or ''		local nature = args['nature'] and args['nature']:lower() or ''
			local eclipse_config = eclipse_types[nature] or { label = "Eclipse", color = "#727272" }
	local color_code = '#727272'
	local ~~eclipse_type~~ = ~~'Eclipse'~~		local type_header = string.format(
		⚫	'<span style="background-color: %s; color: white; display: block;">%s</span>',
	if nature == 'total' then
			eclipse_config.color,
	color_code = '#690005'
			eclipse_config.label
	eclipse_type = 'Total eclipse'
	elseif nature == 'partial' then
	color_code = '#c56b55'
	eclipse_type = 'Partial eclipse'
	elseif nature == 'annular' then
	color_code = '#5555c5'
	eclipse_type = 'Annular eclipse'
	elseif nature == 'hybrid' then
	color_code = '#55c555'
	eclipse_type = 'Hybrid eclipse'
	end

	local type_header = string.format(
⚫	'<span style="background-color: %s; color: white; display: block;">%s</span>',
	color_code,
	eclipse_type
	)		)

StrawberryMaster: Added nature subheader (standardizing with the lunar eclipse infobox)

2025-02-11T21:41:00Z

Added nature subheader (standardizing with the lunar eclipse infobox)

@@ Line 179: / Line 179: @@
 		belowstr = string.format('<div style="width:100%%"><div class="noprint" style="text-align:right">%s →</div></div>', nextLink)
 	end
@@ Line 194: / Line 217: @@
 		["data1"] = mapstr,
 ------------- Type of eclipse and saros -------------
-		["header2"] = "Type of eclipse" .. (args['type_ref'] or ''),
+		["header2"] = type_header,
 		["label4"]  = "[[Gamma (eclipse)|Gamma]]",
 		["data4"]   = args['gamma'] or '',

StrawberryMaster: preference for date over full link

2025-01-18T19:38:33Z

preference for date over full link

@@ Line 85: / Line 85: @@
 local function createLink(label, suffix)
-	if not label or label == '' then
+    if not label or label == '' then
-		return ''
+        return ''
-	end
+    end
-	local link = mw.ustring.format('%s solar eclipse', label)
+        local dateLabel = mw.ustring.sub(label, #prefix + 1)
 end

StrawberryMaster: Minor cleanup

2025-01-13T01:35:08Z

Minor cleanup

← Previous revision		Revision as of 01:35, 13 January 2025
Line 20:		Line 20:
	end		end

	local function ifnotempty(s,a,b)		local function ifnotempty(s, a, b)
	if (s and s ~= '') ~~then~~		return (s and s ~= '') and a or b
	return a
	else
	return b
⚫	end
	end		end

Line 43:		Line 39:

	local function parsecoord(frame, s)		local function parsecoord(frame, s)
	local lat = s:match('^%s([%d][%d.])%s[NS]%s[%d][%d.][EW]%s$')		local lat, NS, lon, EW = s:match('^%s(%d+%.?%d)%s([NS])%s(%d+%.?%d)%s([EW])%s*$')
		⚫	if lat and NS and lon and EW then
	local NS = s:match('^%s[%d][%d.]%s([NS])%s[%d][%d.][EW]%s$')
			return frame:expandTemplate{
	local lon = s:match('^%s[%d][%d.]%s[NS]%s([%d][%d.])[EW]%s$')
			title = 'coord',
	local EW = s:match('^%s[%d][%d.]%s[NS]%s[%d][%d.]([EW])%s$')
		⚫	args = {lat, NS, lon, EW, 'type:landmark'}
⚫	if( lat and NS and lon and EW ) then
			}
⚫	~~return~~ ~~frame:expandTemplate{~~ ~~title~~ = ~~'coord',~~ args = {lat, NS, lon, EW, 'type:landmark'} }
		⚫	end
	else
	return s		return s
	end
	end		end

Line 243:		Line 238:
	end		end

	args['previous'] = args['previous']
	args['next'] = args['next']

	return infobox(frame)		return infobox(frame)
	end		end

StrawberryMaster: standardizing

2025-01-12T23:04:00Z

standardizing

← Previous revision		Revision as of 23:04, 12 January 2025
Line 151:		Line 151:

	local function infobox(frame)		local function infobox(frame)
	local ~~abovestr~~ = ifnotempty(args['date'],		local titlestr = ifnotempty(args['date'],
	"Solar eclipse of " .. (args['date'] or ''),		"Solar eclipse of " .. (args['date'] or ''),
	"For instructions on use, see [[Template:Infobox Solar eclipse]]")		"For instructions on use, see [[Template:Infobox Solar eclipse]]")
Line 177:		Line 177:
	["bodyclass"] = "vevent",		["bodyclass"] = "vevent",
	["bodystyle"] = "width:25em; text-align:left; font-size:88%;",		["bodystyle"] = "width:25em; text-align:left; font-size:88%;",
	["~~above~~"] = ~~abovestr~~,		["title"] = titlestr,
	["aboveclass"] = "summary",
	["abovestyle"] = "padding-bottom:0.25em; background:" .. bgcolor .. "; line-height:1.2em; text-align:center; font-size:115%;",
	["below"] = belowstr,		["below"] = belowstr,
	["belowstyle"] = "text-align:center; padding-top:0.5em",		["belowstyle"] = "text-align:center; padding-top:0.5em",

StrawberryMaster: testing previous/next section (part 4)

2025-01-12T22:42:06Z

testing previous/next section (part 4)

← Previous revision		Revision as of 22:42, 12 January 2025
Line 93:		Line 93:
	return ''		return ''
	end		end
			-- if label is a valid link or not
			if mw.ustring.match(label, "^%[%[.*%]%]$") then
			return label
			end
			-- create a link otherwise
	local link = mw.ustring.format('%s solar eclipse', label)		local link = mw.ustring.format('%s solar eclipse', label)
	if ifexist(link) then		if ifexist(link) then

StrawberryMaster: testing previous/next section (part 3)

2025-01-12T22:19:34Z

testing previous/next section (part 3)

← Previous revision		Revision as of 22:19, 12 January 2025
Line 158:		Line 158:
	local prevLink = createLink(args['previous'], 'solar eclipse')		local prevLink = createLink(args['previous'], 'solar eclipse')
	local nextLink = createLink(args['next'], 'solar eclipse')		local nextLink = createLink(args['next'], 'solar eclipse')
	local belowstr = ~~ifnotempty(prevLink .. nextLink,~~		local belowstr = ''
		⚫	if prevLink ~= '' and nextLink ~= '' then
	string.format('<div style="width:100%%"><div class="noprint" style="float:left">← %s</div><div class="noprint" style="float:right">%s →</div></div>',		belowstr = string.format('<div style="width:100%%"><div class="noprint" style="float:left">← %s</div><div class="noprint" style="float:right">%s →</div></div>',
⚫	prevLink, nextLink),
			prevLink, nextLink)
	'')
			elseif prevLink ~= '' then
			belowstr = string.format('<div style="width:100%%"><div class="noprint" style="text-align:left">← %s</div></div>', prevLink)
			elseif nextLink ~= '' then
			belowstr = string.format('<div style="width:100%%"><div class="noprint" style="text-align:right">%s →</div></div>', nextLink)
			end


	return frame:expandTemplate{ title = 'infobox', args = {		return frame:expandTemplate{ title = 'infobox', args = {

StrawberryMaster: testing previous/next section (part 2)

2025-01-12T21:55:17Z

testing previous/next section (part 2)

← Previous revision		Revision as of 21:55, 12 January 2025
Line 159:		Line 159:
	local nextLink = createLink(args['next'], 'solar eclipse')		local nextLink = createLink(args['next'], 'solar eclipse')
	local belowstr = ifnotempty(prevLink .. nextLink,		local belowstr = ifnotempty(prevLink .. nextLink,
	string.format('<div style="~~display~~:~~flex;~~ ~~justify-content~~:~~space-between;~~">%s %s</div>', ~~prevLink, nextLink),~~		string.format('<div style="width:100%%"><div class="noprint" style="float:left">← %s</div><div class="noprint" style="float:right">%s →</div></div>',
			prevLink, nextLink),
	'')		'')

Line 169:		Line 170:
	["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%;",
	["below"] = belowstr,		["below"] = belowstr,
	["belowstyle"] = "text-align:center~~; font-size:90%~~; padding-top:0.5em;",		["belowstyle"] = "text-align:center; padding-top:0.5em",
	------------------ Images and maps ------------------		------------------ Images and maps ------------------
	["image"] = InfoboxImage(args['image']),		["image"] = InfoboxImage(args['image']),