Module:Timeline - Revision history

Baseplate at 11:04, 24 October 2026

2026-10-24T11:04:01Z

← Older revision		Revision as of 11:04, 24 October 2026
Line 207:		Line 207:
	local function renderSection(title, year, schedule)		local function renderSection(title, year, schedule)
	local out = {}		local out = {}

	~~local rowClass = ""~~
	~~if title == "Character News" then rowClass = " class='character-news'" end~~

	-- Table Wrapper		-- Table Wrapper
Line 216:		Line 213:

	-- Section Title		-- Section Title
	out[#out + 1] = '<tr~~' .. rowClass .. '~~><th colspan="4" class="tl-header">' .. title .. "</th></tr>"		out[#out + 1] = '<tr><th colspan="4" class="tl-header">' .. title .. "</th></tr>"

	-- Column Headers		-- Column Headers
Line 265:		Line 262:

	local startDate, endDate = Calendar.realDate(year, first), Calendar.realDate(year, last)		local startDate, endDate = Calendar.realDate(year, first), Calendar.realDate(year, last)
	local dateText = (first == last) and startDate or (startDate .. " to " .. endDate)
			-- THIS IS THE FIX: Added <br> before the "to"
			local dateText = (first == last) and startDate or (startDate .. " to<br>" .. endDate)

	out[#out + 1] = "<tr>"		out[#out + 1] = "<tr>"

Baseplate at 10:49, 24 October 2026

2026-10-24T10:49:55Z

← Older revision		Revision as of 10:49, 24 October 2026
Line 208:		Line 208:
	local out = {}		local out = {}

	~~-- Colors based on category~~		local rowClass = ""
	local ~~headerBg~~ = "~~#3a506b~~"		if title == "Character News" then rowClass = " class='character-news'" end
	if title == "Character News" then ~~headerBg~~ = "~~#6e473b~~" end

	-- ~~CSS Injection to guarantee styling~~		-- Table Wrapper
	out[#out + 1] = '<div style="overflow-x:auto; border: 1px solid #d1d5db; border-radius: 12px; margin-bottom: 2em; box-shadow: 0 4px 12px rgba(0,0,0,0.05);">'		out[#out + 1] = '<div style="overflow-x:auto; border: 1px solid #d1d5db; border-radius: 12px; margin-bottom: 2em; box-shadow: 0 4px 12px rgba(0,0,0,0.05);">'
	~~out[#out + 1] = '<style>'~~		out[#out + 1] = '<table class="aquila-timeline-custom">'
	.. '.aquila-timeline-custom th { background-color: #f8fafc !important; color: #1e293b !important; font-family: "Georgia", serif !important; padding: 10px !important; text-align: left !important; border-bottom: 2px solid #e2e8f0 !important; border-right: 1px solid #e2e8f0 !important; }'
	.. '.aquila-timeline-custom .tl-header { background-color: ' .. headerBg .. ' !important; color: #ffffff !important; font-size: 1.1em !important; text-align: center !important; border-bottom: 3px solid #e0a96d !important; text-transform: uppercase !important; letter-spacing: 0.1em !important; padding: 12px !important; }'
	~~.. '.aquila-timeline-custom td { padding: 12px 10px !important; border-bottom: 1px solid #e2e8f0 !important; border-right: 1px solid #e2e8f0 !important; vertical-align: top !important; }'~~
	~~.. '.aquila-timeline-custom td:last-child { border-right: none !important; }'~~
	~~.. '.aquila-timeline-custom .tl-date { color: #64748b !important; font-size: 0.9em !important; white-space: nowrap !important; }'~~
	~~.. '.aquila-timeline-custom .tl-empty { color: #64748b !important; font-style: italic !important; font-size: 0.9em !important; }'~~
	~~.. '.aquila-timeline-custom .tl-empty-text { color: #94a3b8 !important; font-style: italic !important; }'~~
	~~.. '.aquila-timeline-custom .tl-day { font-weight: bold !important; color: #1e293b !important; }'~~
	~~.. '</style>'~~

	out[#out + 1] = '<table class="aquila-timeline-custom~~" style="width:100%; border-collapse: collapse; background: #ffffff; margin: 0;~~">'

	-- Section Title		-- Section Title
	out[#out + 1] = '<tr><th colspan="4" class="tl-header">' .. title .. "</th></tr>"		out[#out + 1] = '<tr' .. rowClass .. '><th colspan="4" class="tl-header">' .. title .. "</th></tr>"

	-- Column Headers		-- Column Headers

Baseplate at 10:49, 24 October 2026

2026-10-24T10:49:10Z

← Older revision		Revision as of 10:49, 24 October 2026
Line 205:		Line 205:
	end		end

	~~-- THIS IS THE ONLY FUNCTION THAT CHANGED~~
	local function renderSection(title, year, schedule)		local function renderSection(title, year, schedule)
	local out = {}		local out = {}
Line 213:		Line 212:
	if title == "Character News" then headerBg = "#6e473b" end		if title == "Character News" then headerBg = "#6e473b" end

	-- ~~Table Wrapper~~		-- CSS Injection to guarantee styling
	out[#out + 1] = '<div style="overflow-x:auto; border: 1px solid #d1d5db; border-radius: 12px; margin-bottom: 2em; box-shadow: 0 4px 12px rgba(0,0,0,0.05);">'		out[#out + 1] = '<div style="overflow-x:auto; border: 1px solid #d1d5db; border-radius: 12px; margin-bottom: 2em; box-shadow: 0 4px 12px rgba(0,0,0,0.05);">'
	out[#out + 1] = '<table style="width:100%; border-collapse: collapse; background: #ffffff; margin: 0;">'		out[#out + 1] = '<style>'
			.. '.aquila-timeline-custom th { background-color: #f8fafc !important; color: #1e293b !important; font-family: "Georgia", serif !important; padding: 10px !important; text-align: left !important; border-bottom: 2px solid #e2e8f0 !important; border-right: 1px solid #e2e8f0 !important; }'
			.. '.aquila-timeline-custom .tl-header { background-color: ' .. headerBg .. ' !important; color: #ffffff !important; font-size: 1.1em !important; text-align: center !important; border-bottom: 3px solid #e0a96d !important; text-transform: uppercase !important; letter-spacing: 0.1em !important; padding: 12px !important; }'
			.. '.aquila-timeline-custom td { padding: 12px 10px !important; border-bottom: 1px solid #e2e8f0 !important; border-right: 1px solid #e2e8f0 !important; vertical-align: top !important; }'
			.. '.aquila-timeline-custom td:last-child { border-right: none !important; }'
			.. '.aquila-timeline-custom .tl-date { color: #64748b !important; font-size: 0.9em !important; white-space: nowrap !important; }'
			.. '.aquila-timeline-custom .tl-empty { color: #64748b !important; font-style: italic !important; font-size: 0.9em !important; }'
			.. '.aquila-timeline-custom .tl-empty-text { color: #94a3b8 !important; font-style: italic !important; }'
			.. '.aquila-timeline-custom .tl-day { font-weight: bold !important; color: #1e293b !important; }'
			.. '</style>'

			out[#out + 1] = '<table class="aquila-timeline-custom" style="width:100%; border-collapse: collapse; background: #ffffff; margin: 0;">'

	-- Section Title		-- Section Title
	out[#out + 1] = '<tr><th colspan="4" ~~style~~="~~background:' .. headerBg .. ' !important; color:#ffffff !important; '~~		out[#out + 1] = '<tr><th colspan="4" class="tl-header">' .. title .. "</th></tr>"
	~~.. 'font-family:\'Georgia\', serif; font-size:1.1em; letter-spacing:0.1em; text-align:center; padding:12px; '~~
	~~.. 'border-bottom:3px solid #e0a96d; text~~-~~transform:uppercase;~~">'
	.. title .. "</th></tr>"

	-- Column Headers		-- Column Headers
	local head = {}		local head = {}
	for _, col in ipairs(COLUMNS) do		for _, col in ipairs(COLUMNS) do
	head[#head + 1] = '<th style="~~background:#f8fafc !important; color:#1e293b !important; font-family:\'Georgia\', serif; '~~		head[#head + 1] = '<th style="width:' .. col[2] .. ';">' .. col[1] .. "</th>"
	~~.. 'padding:10px; text-align:left; border-bottom:2px solid #e2e8f0; border-right:1px solid #e2e8f0;~~ width:' .. col[2] .. ';">' .. col[1] .. "</th>"
	end		end
	out[#out + 1] = "<tr>" .. table.concat(head) .. "</tr>"		out[#out + 1] = "<tr>" .. table.concat(head) .. "</tr>"
Line 253:		Line 259:
	local row = {}		local row = {}
	if idx == 1 then		if idx == 1 then
	row[#row + 1] = ~~cell(~~		row[#row + 1] = '<td class="tl-day"' .. (count > 1 and ' rowspan="' .. count .. '"' or "") .. '>' .. DAY_LABELS[day] .. ", Year " .. year .. '</td>'
	~~DAY_LABELS[~~day~~] .. ", Year~~ " .. ~~year,~~
	(count > 1 and ' rowspan="' .. count .. '"' or "") .. ' ~~style=~~"~~padding:12px 10px; border-bottom:1px solid #e2e8f0; border-right:1px solid #e2e8f0; font-weight:bold; color:#1e293b; vertical-align:top;~~"'
	)
	end		end
	row[#row + 1] = cell(ev.post~~, ' style="padding:12px 10px; border-bottom:1px solid #e2e8f0; border-right:1px solid #e2e8f0; vertical-align:top;"'~~)		row[#row + 1] = cell(ev.post)
	row[#row + 1] = cell(ev.char~~, ' style="padding:12px 10px; border-bottom:1px solid #e2e8f0; border-right:1px solid #e2e8f0; vertical-align:top;"'~~)		row[#row + 1] = cell(ev.char)
	if span[idx] then		if span[idx] then
	row[#row + 1] = ~~cell(~~		row[#row + 1] = '<td class="tl-date"' .. (span[idx] > 1 and ' rowspan="' .. span[idx] .. '"' or "") .. '>' .. dates[idx] .. '</td>'
	~~dates[idx],~~
	(span[idx] > 1 and ' rowspan="' .. span[idx] .. '"' or "") .. ' ~~style="padding:12px 10px; border-bottom:1px solid #e2e8f0; vertical-align:top; color:#64748b; font-size:0~~.~~9em; white-space:nowrap;"~~'
	)
	end		end
	out[#out + 1] = "<tr>" .. table.concat(row) .. "</tr>"		out[#out + 1] = "<tr>" .. table.concat(row) .. "</tr>"
Line 280:		Line 280:

	out[#out + 1] = "<tr>"		out[#out + 1] = "<tr>"
	.. ~~cell(~~rangeLabel(first, last, year), ' ~~style="padding:12px 10px; border-bottom:1px solid #e2e8f0; border-right:1px solid #e2e8f0; color:#64748b; font-style:italic; font-size:0.9em;"~~')		.. '<td class="tl-empty">' .. rangeLabel(first, last, year) .. '</td>'
	.. ~~cell(EMPTY_ROW_TEXT,~~ ' colspan="2" ~~style~~="~~padding:12px 10px; border~~-~~bottom:1px solid #e2e8f0; border~~-~~right:1px solid #e2e8f0; color:#94a3b8; font-style:italic;~~"')		.. '<td colspan="2" class="tl-empty-text">' .. EMPTY_ROW_TEXT .. '</td>'
	.. ~~cell(dateText,~~ ' ~~style~~="~~padding:12px 10px; border~~-~~bottom:1px solid #e2e8f0; color:#64748b; font-size:0~~.~~9em; white-space:nowrap;"~~')		.. '<td class="tl-date">' .. dateText .. '</td>'
	.. "</tr>"		.. "</tr>"
	end		end

Baseplate at 10:46, 24 October 2026

2026-10-24T10:46:30Z

Show changes

Baseplate at 10:45, 24 October 2026

2026-10-24T10:45:31Z

Show changes

Baseplate at 10:43, 24 October 2026

2026-10-24T10:43:52Z

← Older revision		Revision as of 10:43, 24 October 2026
Line 6:		Line 6:
	local SPLIT_CHARACTERS = true		local SPLIT_CHARACTERS = true
	local LEGACY_MAX_EVENTS = 9		local LEGACY_MAX_EVENTS = 9
	local EMPTY_ROW_TEXT = ""		local EMPTY_ROW_TEXT = "No news"

	local CARGO_TABLE = "NewsPosts"		local CARGO_TABLE = "NewsPosts"
Line 205:		Line 205:
	end		end

			-- THIS IS THE ONLY FUNCTION THAT CHANGED
	local function renderSection(title, year, schedule)		local function renderSection(title, year, schedule)
	local out = {}		local out = {}

			-- Colors based on category
			local headerBg = "#3a506b"
			if title == "Character News" then headerBg = "#6e473b" end

			-- Table Wrapper
			out[#out + 1] = '<div style="overflow-x:auto; border: 1px solid #d1d5db; border-radius: 12px; margin-bottom: 2em; box-shadow: 0 4px 12px rgba(0,0,0,0.05);">'
			out[#out + 1] = '<table style="width:100%; border-collapse: collapse; background: #ffffff; margin: 0;">'

	~~out[#out + 1] = '<div style="overflow~~-~~x:auto;">'~~		-- Section Title
	~~out[#out + 1] = '<table class="wikitable aquila~~-~~timeline" style="width:100%;">'~~		out[#out + 1] = '<tr><th colspan="4" style="background:' .. headerBg .. '; color:#ffffff; '
			.. 'font-family:\'Georgia\', serif; font-size:1.1em; letter-spacing:0.1em; text-align:center; padding:12px; '
	out[#out + 1] = '<tr><th colspan="4" style="background~~-color~~:~~#f1f5f9~~; color:#~~0b132b~~; '		.. 'border-bottom:3px solid #e0a96d; text-transform:uppercase;">'
	.. 'text-align:center; ~~font-weight~~:~~bold~~; ~~padding~~:~~6px~~; text-transform:uppercase;">'
	.. title .. "</th></tr>"		.. title .. "</th></tr>"

			-- Column Headers
	local head = {}		local head = {}
	for _, col in ipairs(COLUMNS) do		for _, col in ipairs(COLUMNS) do
	head[#head + 1] = '<th style="width:' .. col[2] .. ';">' .. col[1] .. "</th>"		head[#head + 1] = '<th style="background:#f8fafc; color:#1e293b; font-family:\'Georgia\', serif; '
			.. 'padding:10px; text-align:left; border-bottom:2px solid #e2e8f0; width:' .. col[2] .. ';">' .. col[1] .. "</th>"
	end		end
	out[#out + 1] = "<tr>" .. table.concat(head) .. "</tr>"		out[#out + 1] = "<tr>" .. table.concat(head) .. "</tr>"
Line 245:		Line 255:
	row[#row + 1] = cell(		row[#row + 1] = cell(
	DAY_LABELS[day] .. ", Year " .. year,		DAY_LABELS[day] .. ", Year " .. year,
	count > 1 and (' rowspan="' .. count .. '"') or ""		(count > 1 and ' rowspan="' .. count .. '"' or "") .. ' style="padding:12px 10px; border-bottom:1px solid #e2e8f0; border-right:1px solid #e2e8f0; font-weight:bold; color:#1e293b; vertical-align:top;"'
	)		)
	end		end
	row[#row + 1] = cell(ev.post)		row[#row + 1] = cell(ev.post, ' style="padding:12px 10px; border-bottom:1px solid #e2e8f0; border-right:1px solid #e2e8f0; vertical-align:top;"')
	row[#row + 1] = cell(ev.char)		row[#row + 1] = cell(ev.char, ' style="padding:12px 10px; border-bottom:1px solid #e2e8f0; border-right:1px solid #e2e8f0; vertical-align:top;"')
	if span[idx] then		if span[idx] then
	row[#row + 1] = cell(		row[#row + 1] = cell(
	dates[idx],		dates[idx],
	span[idx] > 1 and (' rowspan="' .. span[idx] .. '"') or ""		(span[idx] > 1 and ' rowspan="' .. span[idx] .. '"' or "") .. ' style="padding:12px 10px; border-bottom:1px solid #e2e8f0; vertical-align:top; color:#64748b; font-size:0.9em; white-space:nowrap;"'
	)		)
	end		end
Line 270:		Line 280:

	out[#out + 1] = "<tr>"		out[#out + 1] = "<tr>"
	.. cell(rangeLabel(first, last, year))		.. cell(rangeLabel(first, last, year), ' style="padding:12px 10px; border-bottom:1px solid #e2e8f0; border-right:1px solid #e2e8f0; color:#64748b; font-style:italic; font-size:0.9em;"')
	.. cell(EMPTY_ROW_TEXT, ' colspan="2"')		.. cell(EMPTY_ROW_TEXT, ' colspan="2" style="padding:12px 10px; border-bottom:1px solid #e2e8f0; border-right:1px solid #e2e8f0; color:#94a3b8; font-style:italic;"')
	.. cell(dateText)		.. cell(dateText, ' style="padding:12px 10px; border-bottom:1px solid #e2e8f0; color:#64748b; font-size:0.9em; white-space:nowrap;"')
	.. "</tr>"		.. "</tr>"
	end		end

Baseplate at 10:42, 24 October 2026

2026-10-24T10:42:44Z

Show changes

Baseplate at 10:42, 24 October 2026

2026-10-24T10:42:29Z

← Older revision		Revision as of 10:42, 24 October 2026
Line 13:		Line 13:
	local categoryUpper = string.upper(category)		local categoryUpper = string.upper(category)

	-- ~~Fetch data from~~ Cargo		-- Query Cargo using preprocess to avoid argument table errors
	local ~~cargoQuery~~ = ~~frame:callParserFunction~~('#cargo_query~~', {~~		local query = string.format(
	tables = 'NewsPosts',		'<div>{{#cargo_query:tables=NewsPosts\|fields=Page_Name,Title,Author,Publisher,DayNum\|where=YearNum=%d AND Type="%s News"\|order by=RealDate ASC}}</div>',
	fields = 'Page_Name,Title~~,Type,RealDate~~,Author,Publisher,DayNum',		year, categoryUpper
	where = 'YearNum=~~' .. tostring(year) .. '~~ AND Type="~~' .. categoryUpper .. '~~ News"',		)
	~~order_by = 'DayNum ASC~~, ~~RealDate ASC'~~		local cargoHTML = frame:preprocess(query)
	})

	~~-- Parse Cargo results~~
	local events = {}		local events = {}
	for i = 1, 14 do events[i] = {} end		for i = 1, 14 do events[i] = {} end

	-- ~~Simple parser for~~ Cargo~~'s template output~~		-- Extract rows from the raw HTML Cargo outputs
	~~local rows = {}~~		for row in string.gmatch(cargoHTML, "<tr>(.-)</tr>") do
	for row in string.gmatch(~~cargoQuery~~, "<tr>(.-)</tr>") do		-- Matches the 5 columns we requested
	local title~~, page~~, author, publisher, day = string.match(row, "<td>(.-)</td><td>(.-)</td><td>(.-)</td><td>(.-)</td><td>(.-)</td>")		local page, title, author, publisher, day = string.match(row, "<td>(.-)</td>%s<td>(.-)</td>%s<td>(.-)</td>%s<td>(.-)</td>%s<td>(.-)</td>")
	if day then		if day then
	local d = tonumber(day)		local d = tonumber(day)
	if d and d >= 1 and d <= 14 then		if d and d >= 1 and d <= 14 then
			-- If Author is empty, use Publisher
			local charName = (author ~= "" and author) or publisher
	table.insert(events[d], {		table.insert(events[d], {
	Post = title,		Post = title,
	Page = page,		Page = page,
	Char = ~~author ~= "" and author or publisher~~,		Char = charName,
	Date = "Auto" -- Handled by ~~Cargo real date if needed~~		Date = "Auto" -- Handled by Lua calculation below
	})		})
	end		end
Line 42:		Line 42:
	end		end

	-- Add manual events from Day1...Day14 parameters		-- Add manual events from Day1...Day14 parameters (for events without wiki pages)
	for i = 1, 14 do		for i = 1, 14 do
	local manualData = frame.args["Day" .. i]		local manualData = frame.args["Day" .. i]
Line 57:		Line 57:
	end		end

	-- Build the HTML table		-- Build the beautiful HTML table
	local html = {}		local html = {}

Line 65:		Line 65:

	table.insert(html, '<div class="aquila-timeline-custom" style="border: 1px solid #d1d5db; border-radius: 12px; overflow: hidden; margin-bottom: 2em; box-shadow: 0 4px 12px rgba(0,0,0,0.05);">')		table.insert(html, '<div class="aquila-timeline-custom" style="border: 1px solid #d1d5db; border-radius: 12px; overflow: hidden; margin-bottom: 2em; box-shadow: 0 4px 12px rgba(0,0,0,0.05);">')
			table.insert(html, '<table style="width: 100%; border-collapse: collapse; background: #ffffff; margin: 0;">')

	-- Table Header		-- Table Header
	~~table.insert(html, '<table style="width: 100%; border-collapse: collapse; background: #ffffff; margin: 0;">')~~
	table.insert(html, '<tr>')		table.insert(html, '<tr>')
	table.insert(html, '<th colspan="4" style="background: ' .. headerBg .. '; color: #ffffff; font-family: \'Georgia\', serif; font-size: 1.1em; letter-spacing: 0.1em; text-align: center; padding: 12px; border-bottom: 3px solid #e0a96d;">' .. categoryUpper .. ' NEWS</th>')		table.insert(html, '<th colspan="4" style="background: ' .. headerBg .. '; color: #ffffff; font-family: \'Georgia\', serif; font-size: 1.1em; letter-spacing: 0.1em; text-align: center; padding: 12px; border-bottom: 3px solid #e0a96d;">' .. categoryUpper .. ' NEWS</th>')
Line 89:		Line 89:

	if eventCount == 0 then		if eventCount == 0 then
	-- Empty Day Logic		-- Empty Day Logic (merges consecutive empty days)
	local emptySpan = 1		local emptySpan = 1
	for j = i + 1, 14 do		for j = i + 1, 14 do
Line 119:		Line 119:

	for idx, event in ipairs(events[i]) do		for idx, event in ipairs(events[i]) do
	table.insert(html, '<tr style="background: #ffffff~~; transition: background 0.2s~~;">')		table.insert(html, '<tr style="background: #ffffff;">')

	-- Date Column (Only on first row of the day)		-- Date Column (Only on first row of the day)
Line 142:		Line 142:
	table.insert(html, '<td style="padding: 12px 10px; border-bottom: 1px solid #e2e8f0; border-right: 1px solid #e2e8f0; vertical-align: top;">' .. charText .. '</td>')		table.insert(html, '<td style="padding: 12px 10px; border-bottom: 1px solid #e2e8f0; border-right: 1px solid #e2e8f0; vertical-align: top;">' .. charText .. '</td>')

	-- Date Column		-- Real Date Column
	local realDate = event.Date or ""		local realDate = event.Date or ""
	if realDate == "Auto" then		if realDate == "Auto" then
			-- Year 1, Day 1 is 2026-07-28. Every year is 14 days.
	local daysOffset = ((year - 1) * 14) + (i - 1)		local daysOffset = ((year - 1) * 14) + (i - 1)
	local timestamp = os.time({year=2026, month=07, day=28, hour=12}) + (daysOffset * 86400)		local timestamp = os.time({year=2026, month=07, day=28, hour=12}) + (daysOffset * 86400)

Baseplate at 10:40, 24 October 2026

2026-10-24T10:40:07Z

Show changes

Baseplate at 09:36, 24 October 2026

2026-10-24T09:36:22Z

Show changes