Module:Sidebar - Revision history

Jdlrobson: Fixes https://phabricator.wikimedia.org/F54694313

2024-05-31T04:48:41Z

Fixes https://phabricator.wikimedia.org/F54694313

← Previous revision		Revision as of 04:48, 31 May 2024
Line 383:		Line 383:
	:cssText(args.basestyle)		:cssText(args.basestyle)
	:cssText(args.listtitlestyle)		:cssText(args.listtitlestyle)
			:cssText('color: var(--color-base)')
	:cssText(args['list' .. num .. 'titlestyle'])		:cssText(args['list' .. num .. 'titlestyle'])
	:node(title)		:node(title)

Izno: move these items to config, discovered during work at meta

2023-03-14T22:35:53Z

move these items to config, discovered during work at meta

← Previous revision		Revision as of 22:35, 14 March 2023
Line 96:		Line 96:
	end		end

	local plainlist_styles = add_list_templatestyles('plainlist', ~~'Plainlist/styles~~.~~css'~~)		local plainlist_styles = add_list_templatestyles('plainlist', cfg.i18n.plainlist_templatestyles)
	local hlist_styles = add_list_templatestyles('hlist', ~~'Hlist/styles~~.~~css'~~)		local hlist_styles = add_list_templatestyles('hlist', cfg.i18n.hlist_templatestyles)

	-- a second workaround for [[phab:T303378]]		-- a second workaround for [[phab:T303378]]
Line 104:		Line 104:
	if has_navbar(args.navbar, args.name) and hlist_styles == '' then		if has_navbar(args.navbar, args.name) and hlist_styles == '' then
	hlist_styles = frame:extensionTag{		hlist_styles = frame:extensionTag{
	name = 'templatestyles', args = { src = ~~'Hlist/styles~~.~~css'~~ }		name = 'templatestyles', args = { src = cfg.i18n.hlist_templatestyles}
	}		}
	end		end


	-- hlist -> plainlist is best-effort to preserve old Common.css ordering. [hlist_note]		-- hlist -> plainlist is best-effort to preserve old Common.css ordering. [hlist_note]
	return hlist_styles .. plainlist_styles		return hlist_styles .. plainlist_styles

Izno: add templatestyles for hlist

2022-12-29T18:01:03Z

add templatestyles for hlist

← Previous revision		Revision as of 18:01, 29 December 2022
Line 53:		Line 53:
	end		end

	-- do we want a navbar
	-- will be wanted later for finding hlist
	local function has_navbar(navbar_mode, sidebar_name)		local function has_navbar(navbar_mode, sidebar_name)
	return navbar_mode ~= cfg.i18n.navbar_none and		return navbar_mode ~= cfg.i18n.navbar_none and
Line 87:		Line 85:
	-- there are a lot of list classes in the wild, so we add their TemplateStyles		-- there are a lot of list classes in the wild, so we add their TemplateStyles
	local function add_list_styles(args)		local function add_list_styles(args)
		⚫	local frame = mw.getCurrentFrame()
	local function add_list_templatestyles(htmlclass, templatestyles)		local function add_list_templatestyles(htmlclass, templatestyles)
⚫	local frame = mw.getCurrentFrame()
	if has_list_class(args, htmlclass) then		if has_list_class(args, htmlclass) then
	return frame:extensionTag{		return frame:extensionTag{
Line 97:		Line 95:
	end		end
	end		end

	-- TODO: get hlist to the point where we can turn this on
	-- see [[MediaWiki talk:Common.css/to do#Hlist]]
	local plainlist_styles = add_list_templatestyles('plainlist', 'Plainlist/styles.css')		local plainlist_styles = add_list_templatestyles('plainlist', 'Plainlist/styles.css')
			local hlist_styles = add_list_templatestyles('hlist', 'Hlist/styles.css')


⚫	return plainlist_styles
			-- a second workaround for [[phab:T303378]]
			-- when that issue is fixed, we can actually use has_navbar not to emit the
			-- tag here if we want
			if has_navbar(args.navbar, args.name) and hlist_styles == '' then
			hlist_styles = frame:extensionTag{
			name = 'templatestyles', args = { src = 'Hlist/styles.css' }
			}
			end

			-- hlist -> plainlist is best-effort to preserve old Common.css ordering. [hlist_note]
		⚫	return hlist_styles .. plainlist_styles
	end		end

Line 340:		Line 348:

	return table.concat({		return table.concat({
			add_list_styles(args), -- see [hlist_note] above about ordering
	base_templatestyles,		base_templatestyles,
	templatestyles,		templatestyles,
	child_templatestyles,		child_templatestyles,
	grandchild_templatestyles,		grandchild_templatestyles,
	add_list_styles(args),
	hiding_templatestyles,		hiding_templatestyles,
	tostring(root),		tostring(root),

Izno: find vanishing TemplateStyles in args, find plainlist in class args

2022-12-20T20:54:04Z

find vanishing TemplateStyles in args, find plainlist in class args

@@ Line 1: / Line 1: @@
 require('strict')
 local cfg = mw.loadData('Module:Sidebar/configuration')
@@ Line 54: / Line 51: @@
 		return false
 	end
 end
@@ Line 65: / Line 130: @@
 		args = getArgs(frame)
 	end
 	local root = mw.html.create()
 	local child = args.child and mw.text.trim(args.child) == cfg.i18n.child_yes
@@ Line 235: / Line 301: @@
 	end
-	if not child then
+	if not child and has_navbar(args.navbar, args.name) then
-				:tag('tr')
+					:cssText(args.navbarstyle)
-					:tag('td')
+					:wikitext(require('Module:Navbar')._navbar{
-							args.name,
+					})
 	end
@@ Line 282: / Line 344: @@
 		child_templatestyles,
 		grandchild_templatestyles,
 		tostring(root),
 		(child and cfg.i18n.category.child or ''),
@@ Line 333: / Line 397: @@
 	local contentArgs = {}
-	local is_centered_list_titles
+	local is_centered_list_titles = false
 	if args['centered list titles'] and args['centered list titles'] ~= '' then
 		is_centered_list_titles = true
 	end

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

2022-10-22T14:42:41Z

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

← Previous revision		Revision as of 14:42, 22 October 2022
Line 2:		Line 2:
	-- This module implements {{Sidebar}}		-- This module implements {{Sidebar}}
	--		--
	require('~~Module:No globals~~')		require('strict')
	local cfg = mw.loadData('Module:Sidebar/configuration')		local cfg = mw.loadData('Module:Sidebar/configuration')

Izno: make wraplinks work like it used to

2021-08-02T20:35:56Z

make wraplinks work like it used to

← Previous revision		Revision as of 20:35, 2 August 2021
Line 77:		Line 77:
	:addClass(args.float == cfg.i18n.float_none and cfg.i18n.class.float_none or nil)		:addClass(args.float == cfg.i18n.float_none and cfg.i18n.class.float_none or nil)
	:addClass(args.float == cfg.i18n.float_left and cfg.i18n.class.float_left or nil)		:addClass(args.float == cfg.i18n.float_left and cfg.i18n.class.float_left or nil)
	:addClass(args.wraplinks == cfg.i18n.wrap_true and cfg.i18n.class.wraplinks or nil)		:addClass(args.wraplinks ~= cfg.i18n.wrap_true and cfg.i18n.class.wraplinks or nil)
	:addClass(args.bodyclass or args.class)		:addClass(args.bodyclass or args.class)
	:css('width', args.width or nil)		:css('width', args.width or nil)

Izno: and here

2021-03-22T17:51:32Z

and here

← Previous revision		Revision as of 17:51, 22 March 2021
Line 334:		Line 334:

	local is_centered_list_titles		local is_centered_list_titles
	if args['centered ~~collapsible~~ titles'] and args['centered ~~collapsible~~ titles'] ~= '' then		if args['centered list titles'] and args['centered list titles'] ~= '' then
	is_centered_list_titles = true		is_centered_list_titles = true
	else		else

Izno: use list to be consistent

2021-03-22T17:50:44Z

use list to be consistent

← Previous revision		Revision as of 17:50, 22 March 2021
Line 288:		Line 288:
	end		end

	local function ~~collapsible_title~~(args, ~~is_centered_collapsible_titles~~, num)		local function list_title(args, is_centered_list_titles, num)

	local title_text = trimAndAddAutomaticNewline(args['list' .. num .. 'title']		local title_text = trimAndAddAutomaticNewline(args['list' .. num .. 'title']
Line 294:		Line 294:

	local title		local title
	if ~~is_centered_collapsible_titles~~ then		if is_centered_list_titles then
	-- collapsible can be finicky, so provide some CSS/HTML to support		-- collapsible can be finicky, so provide some CSS/HTML to support
	title = mw.html.create('div')		title = mw.html.create('div')
Line 333:		Line 333:
	local contentArgs = {}		local contentArgs = {}

			local is_centered_list_titles
	local is_centered_collapsible_titles
	if args['centered collapsible titles'] and args['centered collapsible titles'] ~= '' then		if args['centered collapsible titles'] and args['centered collapsible titles'] ~= '' then
	~~is_centered_collapsible_titles~~ = true		is_centered_list_titles = true
	else		else
	~~is_centered_collapsible_titles~~ = false		is_centered_list_titles = false
	end		end

Line 353:		Line 353:
	:cssText(args.listframestyle)		:cssText(args.listframestyle)
	:cssText(args['list' .. num .. 'framestyle'])		:cssText(args['list' .. num .. 'framestyle'])
	:node(~~collapsible_title~~(args, ~~is_centered_collapsible_titles~~, num))		:node(list_title(args, is_centered_list_titles, num))
	:tag('div')		:tag('div')
	:addClass(cfg.i18n.class.list_content)		:addClass(cfg.i18n.class.list_content)

Izno: add list-title-centered

2021-03-22T17:40:20Z

add list-title-centered

@@ Line 286: / Line 286: @@
 		categorizeTemplatesWithInlineStyles(args)
 	})
 end
@@ Line 302: / Line 332: @@
 	local contentArgs = {}
 	for k, v in pairs(args) do
@@ Line 316: / Line 353: @@
 				:cssText(args.listframestyle)
 				:cssText(args['list' .. num .. 'framestyle'])
 				:tag('div')
 					:addClass(cfg.i18n.class.list_content)

Izno: breaking more wikis

2021-02-15T23:29:21Z

breaking more wikis

← Previous revision		Revision as of 23:29, 15 February 2021
Line 47:		Line 47:
	--[[		--[[
	Finds whether a sidebar has a subgroup sidebar.		Finds whether a sidebar has a subgroup sidebar.

	TODO: Remove support for legacy class name
	]]		]]
	local function hasSubgroup(s)		local function hasSubgroup(s)
	if mw.ustring.find(s, cfg.i18n.pattern.subgroup) or		if mw.ustring.find(s, cfg.i18n.pattern.subgroup) then
	mw.ustring.find(s, 'vertical%-navbox%-subgroup') then
	return true		return true
	else		else
Line 77:		Line 74:
	-- force collapsibleclass to be sidebar-collapse otherwise output nothing		-- force collapsibleclass to be sidebar-collapse otherwise output nothing
	:addClass(collapsibleClass == cfg.i18n.class.collapse and cfg.i18n.class.collapse or nil)		:addClass(collapsibleClass == cfg.i18n.class.collapse and cfg.i18n.class.collapse or nil)
	:addClass('vertical-navbox') -- legacy class, TODO: Remove after migrating users
	:addClass('nomobile')		:addClass('nomobile')
	:addClass(args.float == cfg.i18n.float_none and cfg.i18n.class.float_none or nil)		:addClass(args.float == cfg.i18n.float_none and cfg.i18n.class.float_none or nil)
Line 256:		Line 252:
	end		end

	local ~~sidebar_templatestyles~~ = ~~mw.getCurrentFrame()~~:extensionTag{		local base_templatestyles = frame:extensionTag{
	name = 'templatestyles', args = { src = cfg.i18n.templatestyles }		name = 'templatestyles', args = { src = cfg.i18n.templatestyles }
	}		}
Line 262:		Line 258:
	local templatestyles = ''		local templatestyles = ''
	if args['templatestyles'] and args['templatestyles'] ~= '' then		if args['templatestyles'] and args['templatestyles'] ~= '' then
	templatestyles = ~~mw.getCurrentFrame()~~:extensionTag{		templatestyles = frame:extensionTag{
	name = 'templatestyles', args = { src = args['templatestyles'] }		name = 'templatestyles', args = { src = args['templatestyles'] }
	}		}
Line 269:		Line 265:
	local child_templatestyles = ''		local child_templatestyles = ''
	if args['child templatestyles'] and args['child templatestyles'] ~= '' then		if args['child templatestyles'] and args['child templatestyles'] ~= '' then
	child_templatestyles = ~~mw.getCurrentFrame()~~:extensionTag{		child_templatestyles = frame:extensionTag{
	name = 'templatestyles', args = { src = args['child templatestyles'] }		name = 'templatestyles', args = { src = args['child templatestyles'] }
	}		}
Line 276:		Line 272:
	local grandchild_templatestyles = ''		local grandchild_templatestyles = ''
	if args['grandchild templatestyles'] and args['grandchild templatestyles'] ~= '' then		if args['grandchild templatestyles'] and args['grandchild templatestyles'] ~= '' then
	grandchild_templatestyles = ~~mw.getCurrentFrame()~~:extensionTag{		grandchild_templatestyles = frame:extensionTag{
	name = 'templatestyles', args = { src = args['grandchild templatestyles'] }		name = 'templatestyles', args = { src = args['grandchild templatestyles'] }
	}		}
Line 282:		Line 278:

	return table.concat({		return table.concat({
			base_templatestyles,
	sidebar_templatestyles,
	templatestyles,		templatestyles,
	child_templatestyles,		child_templatestyles,