Module:Current events calendar - Revision history

Izno: templatestyles, some cleaning of styles and whatnot

2021-11-02T16:07:23Z

templatestyles, some cleaning of styles and whatnot

Matt Fitzpatrick: noprint arrow links

2017-09-20T03:53:12Z

noprint arrow links

← Previous revision		Revision as of 03:53, 20 September 2017
Line 130:		Line 130:
	:tag('th')		:tag('th')
	:css{['text-align'] = 'center'}		:css{['text-align'] = 'center'}
			:tag('span')
⚫	:wikitext(makeWikilink('Portal:Current events/' .. dateStuff.previousMonthAndYear, '◀'))
			:addClass('noprint')
		⚫	:wikitext(makeWikilink('Portal:Current events/' .. dateStuff.previousMonthAndYear, '◀'))
			:done()
	:done()		:done()
	:tag('th')		:tag('th')
Line 139:		Line 142:
	:tag('th')		:tag('th')
	:css{['text-align'] = 'center'}		:css{['text-align'] = 'center'}
			:tag('span')
⚫	:wikitext(makeWikilink('Portal:Current events/' .. dateStuff.nextMonthAndYear, '▶'))
			:addClass('noprint')
		⚫	:wikitext(makeWikilink('Portal:Current events/' .. dateStuff.nextMonthAndYear, '▶'))

	-- Day of week headings		-- Day of week headings

Matt Fitzpatrick: partial self rv, left padding not necessary because text-align right

2017-09-20T03:36:58Z

partial self rv, left padding not necessary because text-align right

← Previous revision		Revision as of 03:36, 20 September 2017
Line 169:		Line 169:
	:tag('td')		:tag('td')
	:attr('colspan', '7')		:attr('colspan', '7')
	:css{~~['padding-left'] = '1em',~~ ['padding-top'] = '3px', ['padding-bottom'] = '5px', ['font-size'] = '78%', ['text-align'] = 'right'}		:css{['padding-top'] = '3px', ['padding-bottom'] = '5px', ['font-size'] = '78%', ['text-align'] = 'right'}
	:wikitext(makeWikilink('Portal:Current events/' .. monthAndYear, 'More ' .. monthAndYear .. ' events...   '))		:wikitext(makeWikilink('Portal:Current events/' .. monthAndYear, 'More ' .. monthAndYear .. ' events...   '))
	end		end

Matt Fitzpatrick: "More Month Year events..." link - added noprint class, added padding instead of nbsp's

2017-09-20T03:35:17Z

"More Month Year events..." link - added noprint class, added padding instead of nbsp's

← Previous revision		Revision as of 03:35, 20 September 2017
Line 166:		Line 166:
	if not dateStuff.argsDate then -- No footer necessary on Archive pages.		if not dateStuff.argsDate then -- No footer necessary on Archive pages.
	root:tag('tr')		root:tag('tr')
			:addClass('noprint')
	:tag('td')		:tag('td')
	:attr('colspan', '7')		:attr('colspan', '7')
	:css{['padding-top'] = '3px', ['padding-bottom'] = '5px', ['font-size'] = '78%', ['text-align'] = 'right'}		:css{['padding-left'] = '1em', ['padding-top'] = '3px', ['padding-bottom'] = '5px', ['font-size'] = '78%', ['text-align'] = 'right'}
	:wikitext(~~'   ' ..~~ makeWikilink('Portal:Current events/' .. monthAndYear, 'More ' .. monthAndYear .. ' events...   '))		:wikitext(makeWikilink('Portal:Current events/' .. monthAndYear, 'More ' .. monthAndYear .. ' events...   '))
	end		end

RossO: CSS error fixed.

2017-09-01T19:52:11Z

CSS error fixed.

← Previous revision		Revision as of 19:52, 1 September 2017
Line 112:		Line 112:
	-- corressponding CSS margin attribute can be simplified.		-- corressponding CSS margin attribute can be simplified.
	local temporaryMarginAdjustment = "auto !important"		local temporaryMarginAdjustment = "auto !important"
	if dateStuff.argsDate then temporaryMarginAdjustment = "~~8px~~ 8px 0 0" end		if dateStuff.argsDate then temporaryMarginAdjustment = "8px 0 0 8px" end
	root		root
	:addClass('infobox')		:addClass('infobox')

RossO: Tweak to support non-grid layouts of the Archive pages.

2017-09-01T19:51:22Z

Tweak to support non-grid layouts of the Archive pages.

← Previous revision		Revision as of 19:51, 1 September 2017
Line 108:		Line 108:
	local monthAndYear = dateStuff.monthAndYear		local monthAndYear = dateStuff.monthAndYear
	local root = mw.html.create('table')		local root = mw.html.create('table')
			-- The next two lines help to make the table-layout-based Archive pages look good. When the
			-- Archives have been converted to a grid-based layout, this logic can be removed, and the
			-- corressponding CSS margin attribute can be simplified.
			local temporaryMarginAdjustment = "auto !important"
			if dateStuff.argsDate then temporaryMarginAdjustment = "8px 8px 0 0" end
	root		root
	:addClass('infobox')		:addClass('infobox')
Line 115:		Line 120:
	float = 'initial',		float = 'initial',
	['max-width'] = '350px',		['max-width'] = '350px',
	margin = ~~'auto !important'~~,		margin = temporaryMarginAdjustment,
	['text-align'] = 'center',		['text-align'] = 'center',
	['background-color'] = '#f5faff',		['background-color'] = '#f5faff',

RossO: Updated code will accept month and year parameters to generate historical calendars

2017-09-01T18:42:18Z

Updated code will accept month and year parameters to generate historical calendars

← Previous revision		Revision as of 18:42, 1 September 2017
Line 1:		Line 1:
	-- This module renders the calendar seen on [[Portal:Current events]].		-- This module renders the calendar seen on [[Portal:Current events]].

			--[[
			Incoming expected variables:
			frame.args.year = Integer value for year
			frame.args.month = Integer value for month, 1 based.
			--]]

	local p = {}		local p = {}
Line 11:		Line 17:
	end		end

	function p.main()		function p.main(frame)
	local ~~dateStuff~~ = ~~p.getDateStuff()~~		local argsDate = nil
			if (frame and frame.args and frame.args.year and frame.args.month) then
			-- If a date is passed in, assume that the display page is an Archive page.
			-- If no date passed in, assume that the display page is the current Current Events page
			argsDate = frame.args.year .. "-" .. frame.args.month .. "-01" -- Construct a date, YYY-M-DD format.
		⚫	end
			local dateStuff = p.getDateStuff(argsDate)
	local dayStrings = p.makeDayStrings(dateStuff)		local dayStrings = p.makeDayStrings(dateStuff)
	return p.export(dayStrings, dateStuff)		return p.export(dayStrings, dateStuff)
	end		end

	function p.getDateStuff()		function p.getDateStuff(argsDate)

			--[[
			Note: This function takes advantage of the formatDate's second argument to
			create data for the archival calendars. If the second arg (argsDate) is nil,
			then formatDate assumes the current date/time.
			--]]

	-- Gets date data.		-- Gets date data.
	local dateStuff = {}		local dateStuff = {}
	local lang = mw.language.getContentLanguage()		local lang = mw.language.getContentLanguage()
			dateStuff.argsDate = argsDate
	--Year		--Year
	local year = lang:formatDate('Y')		local year = lang:formatDate('Y', argsDate)
	year = tonumber(year)		year = tonumber(year)
	dateStuff.year = year		dateStuff.year = year
	-- Month		-- Month
	local month = lang:formatDate('F')		local month = lang:formatDate('F', argsDate)
	dateStuff.month = month		dateStuff.month = month
	-- Month and year		-- Month and year
	local monthAndYear = lang:formatDate('F Y')		local monthAndYear = lang:formatDate('F Y', argsDate)
	local firstOfMonth = lang:formatDate('01-m-Y')		local firstOfMonth = lang:formatDate('01-m-Y', argsDate)
	dateStuff.monthAndYear = monthAndYear		dateStuff.monthAndYear = monthAndYear
	-- Previous month and year		-- Previous month and year
Line 37:		Line 57:
	dateStuff.nextMonthAndYear = lang:formatDate('F Y', firstOfMonth .. ' +1 month')		dateStuff.nextMonthAndYear = lang:formatDate('F Y', firstOfMonth .. ' +1 month')
	-- Day		-- Day
	local day = lang:formatDate('j')		local day = lang:formatDate('j', argsDate)
	day = tonumber(day)		day = tonumber(day)
	dateStuff.day = day		dateStuff.day = day
Line 60:		Line 80:
	local makeDayLink = p.makeDayLink		local makeDayLink = p.makeDayLink
	for day = 1, dateStuff.daysInMonth do		for day = 1, dateStuff.daysInMonth do
	if isLinkworthy(day, currentDay) then		if dateStuff.argsDate or isLinkworthy(day, currentDay) then
	calStrings[#calStrings + 1] = makeDayLink(day, currentMonth, currentYear)		calStrings[#calStrings + 1] = makeDayLink(day, currentMonth, currentYear)
	else		else
Line 124:		Line 144:
	:wikitext(weekday)		:wikitext(weekday)
	end		end


	-- Days		-- Days
	local ~~colspan~~ = dateStuff.firstWeekday - 1		local cellCount = 1 - dateStuff.firstWeekday -- Tracks the number of day cells. Negative values used for initial blank cells.
	~~local~~ cellCount = 0 -- ~~Tracks the number of day~~ ~~cells.~~		while cellCount < #dayStrings do -- Weekly rows
	local ~~firstDayRow~~ = root:tag('tr')		local weeklyRow = root:tag('tr')
		⚫	for i = 1, 7 do -- Always make 7 cells.
	if colspan > 1 then
⚫	~~firstDayRow~~:tag('td')
	:attr('colspan', tostring(colspan))
	elseif colspan == 1 then
	firstDayRow:tag('td')
⚫	end
	for i = colspan + 1, 7 do -- Finish the first row
	cellCount = cellCount + 1
	firstDayRow:tag('td')
	:css{['text-align'] = 'center'}
	:wikitext(dayStrings[cellCount])
⚫	end
	while cellCount < #dayStrings do -- Second day row onwards
	local otherDayRow = root:tag('tr')
⚫	for i = 1, 7 do
	cellCount = cellCount + 1		cellCount = cellCount + 1
	local dayString = dayStrings[cellCount]		local dayString = dayStrings[cellCount] or " " -- Use a blank cell if there is no corresponding dateString
		⚫	weeklyRow:tag('td')
	if not dayString then
	dayString = " "
	end
	otherDayRow:tag('td')
	:css{['text-align'] = 'center'}		:css{['text-align'] = 'center'}
	:wikitext(dayString)		:wikitext(dayString)
Line 156:		Line 159:

	-- Footer		-- Footer
			if not dateStuff.argsDate then -- No footer necessary on Archive pages.
	root:tag('tr')
	:tag('td')		root:tag('tr')
	:attr('colspan', '7')		:tag('td')
			:attr('colspan', '7')
	:css{['padding-top'] = '3px', ['padding-bottom'] = '5px', ['font-size'] = '78%', ['text-align'] = 'right'}		:css{['padding-top'] = '3px', ['padding-bottom'] = '5px', ['font-size'] = '78%', ['text-align'] = 'right'}
	:wikitext('   ' .. makeWikilink('Portal:Current events/' .. monthAndYear, 'More ' .. monthAndYear .. ' events...   '))		:wikitext('   ' .. makeWikilink('Portal:Current events/' .. monthAndYear, 'More ' .. monthAndYear .. ' events...   '))
		⚫	end

	return tostring(root)		return tostring(root)

RossO: Margin override of CSS override from Minerva.css

2017-08-29T22:52:19Z

Margin override of CSS override from Minerva.css

← Previous revision		Revision as of 22:52, 29 August 2017
Line 95:		Line 95:
	float = 'initial',		float = 'initial',
	['max-width'] = '350px',		['max-width'] = '350px',
	margin = 'auto',		margin = 'auto !important',
	['text-align'] = 'center',		['text-align'] = 'center',
	['background-color'] = '#f5faff',		['background-color'] = '#f5faff',

RossO: Slightly more flexibility to the calendar layout to improve look on desktop views.

2017-08-29T18:45:06Z

Slightly more flexibility to the calendar layout to improve look on desktop views.

← Previous revision		Revision as of 18:45, 29 August 2017
Line 94:		Line 94:
	width = '100%',		width = '100%',
	float = 'initial',		float = 'initial',
	['max-width'] = '~~250px~~',		['max-width'] = '350px',
	margin = 'auto',		margin = 'auto',
	['text-align'] = 'center',		['text-align'] = 'center',

RossO: Prevent override of HTML display mode.

2017-08-28T18:24:39Z

Prevent override of HTML display mode.

← Previous revision		Revision as of 18:24, 28 August 2017
Line 91:		Line 91:
	:addClass('infobox')		:addClass('infobox')
	:css{		:css{
			display = 'table',
	width = '100%',		width = '100%',
	float = 'initial',		float = 'initial',