Module:Calendar widget - Revision history

Trappist the monk at 00:19, 14 February 2024

2024-02-14T00:19:12Z

← Previous revision		Revision as of 00:19, 14 February 2024
Line 262:		Line 262:
	local css_opts = props.week_color and {['background'] = props.week_color} or {}		local css_opts = props.week_color and {['background'] = props.week_color} or {}

	if props.iso_wk then		if props.iso_wk or props.iso then
			if props.iso_wk then
	table.insert (headers, repeat_tags ('th', {'Wk'}, {['class']='mcal', ['attr']={['title'] = 'ISO week number'}, ['css'] = css_opts})); -- iso week header		table.insert (headers, repeat_tags ('th', {'Wk'}, {['class']='mcal', ['attr']={['title'] = 'ISO week number'}, ['css'] = css_opts})); -- iso week header
			end
	for i, abbr in ipairs (iso_dayabbr) do		for i, abbr in ipairs (iso_dayabbr) do
	table.insert (headers, repeat_tags ('th', {iso_dayabbr[i]}, {['class']='mcal', ['attr']={['title'] = iso_dayname[i]}, ['css'] = css_opts}));		table.insert (headers, repeat_tags ('th', {iso_dayabbr[i]}, {['class']='mcal', ['attr']={['title'] = iso_dayname[i]}, ['css'] = css_opts}));

JPxG: fix

2024-02-13T22:51:02Z

fix

← Previous revision		Revision as of 22:51, 13 February 2024
Line 204:		Line 204:
	local result = {};		local result = {};
	local hilite;		local hilite;
			local hilite_two;

	for col = 1, 7 do		for col = 1, 7 do

JPxG: attempt to add a way of highlighting arbitrary dates

2024-02-13T22:50:44Z

attempt to add a way of highlighting arbitrary dates

← Previous revision		Revision as of 22:50, 13 February 2024
Line 225:		Line 225:
	if (props.year == props.this_ynum) and (mnum == props.this_mnum) and (dom == props.this_dnum) then		if (props.year == props.this_ynum) and (mnum == props.this_mnum) and (dom == props.this_dnum) then
	hilite = col;		hilite = col;
			end
			end
			if props.aday then -- highlight arbitrary date when displayed
			if (props.year == props.this_ynum) and (mnum == props.this_mnum) and (dom == props.this_dnum) then
			hilite_two = col;
	end		end
	end		end
Line 235:		Line 240:
	table.insert (result, repeat_tags ('td', {td_item}, {['class']='mcal', ['css'] = {['background-color'] = props.today_color or '#cfc'}}));		table.insert (result, repeat_tags ('td', {td_item}, {['class']='mcal', ['css'] = {['background-color'] = props.today_color or '#cfc'}}));
	else		else
			if i == hilite_two then
			table.insert (result, repeat_tags ('td', {td_item}, {['class']='mcal', ['css'] = {['background-color'] = props.aday_color or '#cfc'}}));
			end
	table.insert (result, repeat_tags ('td', {td_item}, options));		table.insert (result, repeat_tags ('td', {td_item}, options));
	end		end
Line 571:		Line 579:
	props.today = 'yes' == (args.show_today and args.show_today:lower()); -- highlight today's date in calendars where it is displayed		props.today = 'yes' == (args.show_today and args.show_today:lower()); -- highlight today's date in calendars where it is displayed
	props.today_color = args.today_color or args.today_colour;		props.today_color = args.today_color or args.today_colour;

			props.aday = 'yes' == (args.show_a_day and args.show_a_day:lower()); -- highlight arbitrary date in calendars where it is displayed
			props.aday_color = args.a_day_color or args.a_day_colour;

	props.title_color = args.title_color or args.title_colour or args.color or args.colour;		props.title_color = args.title_color or args.title_colour or args.color or args.colour;

WOSlinker: use require('strict') instead of require('Module:No globals')

2022-10-21T22:04:19Z

use require('strict') instead of require('Module:No globals')

← Previous revision		Revision as of 22:04, 21 October 2022
Line 3:		Line 3:

	--]]		--]]
	require('~~Module:No globals~~');		require('strict');
	local getArgs = require ('Module:Arguments').getArgs;		local getArgs = require ('Module:Arguments').getArgs;

Trappist the monk at 20:44, 1 April 2020

2020-04-01T20:44:09Z

← Previous revision		Revision as of 20:44, 1 April 2020
Line 461:		Line 461:

	props.year = args.year and tonumber(args.year) or this_year_num;		props.year = args.year and tonumber(args.year) or this_year_num;
		⚫	if (1583 > props.year) or (1582 == props.year and 10 > props.month_num) then -- gregorian calendar only (1583 for yearly calendar because gregorian started in October of 1582)
		⚫	props.year = this_year_num; -- so use this year
		⚫	end

	props.leap = is_leap (props.year)		props.leap = is_leap (props.year)

Line 524:		Line 528:
	end		end

⚫	if (1583 > props.year) or (1582 == props.year and 10 > props.month_num) then -- gregorian calendar only (1583 for yearly calendar because gregorian started in October of 1582)
⚫	props.year = this_year_num; -- so use this year
⚫	end

	props.iso_wk = 'yes' == (args.iso_wk and args.iso_wk:lower()); -- show iso format with week numbers when true		props.iso_wk = 'yes' == (args.iso_wk and args.iso_wk:lower()); -- show iso format with week numbers when true
	props.iso = 'yes' == (args.iso and args.iso:lower()) or props.iso_wk; -- iso format without week number unless props.iso_wk true; always true when props.iso_wk true		props.iso = 'yes' == (args.iso and args.iso:lower()) or props.iso_wk; -- iso format without week number unless props.iso_wk true; always true when props.iso_wk true

Trappist the monk at 16:56, 10 July 2019

2019-07-10T16:56:08Z

@@ Line 52: / Line 52: @@
 		iso and lang_obj:formatDate ('N', year .. '-' .. month .. '-' .. day) or	-- ISO: 1 = monday
 		lang_obj:formatDate ('w', year .. '-' .. month .. '-' .. day) + 1;			-- 1 = sunday
 end
@@ Line 188: / Line 183: @@
 			:attr (opt_attr)
 			:css (css_opts)
-			:wikitext (item)													-- get a calendar for month number mnum
+			:wikitext (item)													-- the item to be wrapped in <tag>...</tag>
 			:done()																-- close <td>
 		table.insert (tags, tostring (repeat_tag));								-- make a string of this object
@@ Line 449: / Line 444: @@
 end
 --[[--------------------------< _ C A L E N D A R >------------------------------------------------------------
@@ Line 628: / Line 592: @@
 ]]
-local function calendar(frame)
+local function calendar (frame)
 	local args=getArgs (frame);
 	return _calendar (args);
@@ Line 639: / Line 603: @@
 return {
 	calendar = calendar,
+	}

Trappist the monk at 14:13, 9 July 2019

2019-07-09T14:13:20Z

Show changes

Trappist the monk at 20:01, 8 July 2019

2019-07-08T20:01:05Z

← Previous revision		Revision as of 20:01, 8 July 2019
Line 536:		Line 536:
	cal_props.prevnext = 'yes' == (args.prevnext and args.prevnext:lower()); -- show previous / next links in month header only in single month calendars		cal_props.prevnext = 'yes' == (args.prevnext and args.prevnext:lower()); -- show previous / next links in month header only in single month calendars

	if args.lk_pref_mprev then		if args.lk_pref_mprev or args.lk_suff_mprev then
	cal_props.lk_pref_mprev = args.lk_pref_mprev;		cal_props.lk_pref_mprev = args.lk_pref_mprev;
			cal_props.lk_suff_mprev = args.lk_suff_mprev;
	cal_props.prevnext = true;		cal_props.prevnext = true;
	end		end

	if args.lk_pref_mnext then		if args.lk_pref_mnext or args.lk_suff_mnext then
	cal_props.lk_pref_mnext = args.lk_pref_mnext;		cal_props.lk_pref_mnext = args.lk_pref_mnext;
			cal_props.lk_suff_mnext = args.lk_suff_mnext;
	cal_props.prevnext = true;		cal_props.prevnext = true;
	end		end
Line 574:		Line 576:
	cal_props.hide_year = ('yes' == args.hide_year) or ('off' == args.show_year); -- year normally displayed; this hides year display but not when linked or replaced with title		cal_props.hide_year = ('yes' == args.hide_year) or ('off' == args.show_year); -- year normally displayed; this hides year display but not when linked or replaced with title
	end		end
			-- TODO: implement these two

	cal_props.lk_pref = args.lk_pref; -- prefix for all links except previous ~~nad~~ next		cal_props.lk_pref = args.lk_pref; -- prefix for all links except previous and next
	cal_props.lk_suff = args.lk_suff; -- suffix for all links except previous ~~nad~~ next		cal_props.lk_suff = args.lk_suff; -- suffix for all links except previous and next

	for _, v in ipairs ({'y', 'm', 'd'}) do -- loop through calendar parts for link prefix and suffix parameters		for _, v in ipairs ({'y', 'm', 'd'}) do -- loop through calendar parts for link prefix and suffix parameters
Line 586:		Line 588:
	end		end

	if not (cal_props.m_center or cal_props.m_float_r) then -- these may aleady be set for month ~~only~~ calendar ~~display~~		if not (cal_props.m_center or cal_props.m_float_r) then -- these may aleady be set for stand-alone month calendar
	cal_props.y_center = 'center' == (args.float and args.float:lower());		cal_props.y_center = 'center' == (args.float and args.float:lower());
	cal_props.y_float_r = 'right' == (args.float and args.float:lower());		cal_props.y_float_r = 'right' == (args.float and args.float:lower());
	end		end
			--TODO: underscore instead of hyphen

	cal_props.today = 'yes' == (args['show-today'] and args['show-today']:lower()); -- highlight today's date in calendars where it is displayed		cal_props.today = 'yes' == (args['show-today'] and args['show-today']:lower()); -- highlight today's date in calendars where it is displayed
	cal_props.today_color = args.today_color or args.today_colour;		cal_props.today_color = args.today_color or args.today_colour;

Trappist the monk at 19:33, 8 July 2019

2019-07-08T19:33:31Z

← Previous revision		Revision as of 19:33, 8 July 2019
Line 273:		Line 273:

	if props.prevnext then		if props.prevnext then
	~~local link_text~~ = ~~(props.lk_pref_mprev and props.lk_pref_mprev or '') ..~~ monthname[(0 < mnum-1) and mnum-1 or 12]		prev = monthname[(0 < mnum-1) and mnum-1 or 12];
			next = monthname[(13 > mnum+1) and mnum+1 or 1];

			if is_set (hdr_year) then
			prev = prev .. ' ' .. ((0 < mnum-1) and hdr_year or hdr_year-1); -- january-1 = december previous year
			next = next .. ' ' .. ((13 > mnum+1) and hdr_year or hdr_year+1); -- december+1 = january next year
			end

			local link_text = (props.lk_pref_mprev or '') .. prev .. (props.lk_suff_mprev or '')
	prev = make_wikilink (link_text, '<<');		prev = make_wikilink (link_text, '<<');

	link_text = (~~props.lk_pref_mnext and~~ props.lk_pref_mnext or '') .. ~~monthname[(13~~ > ~~mnum+1) and mnum+1~~ or 1]		link_text = (props.lk_pref_mnext or '') .. next .. (props.lk_suff_mnext or '')
	next = make_wikilink (link_text, '>>');		next = make_wikilink (link_text, '>>');

Trappist the monk at 17:11, 8 July 2019

2019-07-08T17:11:10Z

Show changes