Module:Shortcut - Revision history

Rickyboy320: 16 revisions imported: Imported Category TOC from wikipedia

2017-08-11T17:56:43Z

16 revisions imported: Imported Category TOC from wikipedia

MSGJ: prevent links linking back to the current page, see Template_talk:Shortcut#Direct_link

2017-03-08T15:56:31Z

prevent links linking back to the current page, see Template_talk:Shortcut#Direct_link

Mr. Stradivarius: remove the first parameter error category per Template talk:Shortcut#The cleanup category should be removed

2016-08-31T23:23:44Z

remove the first parameter error category per Template talk:Shortcut#The cleanup category should be removed

Xaosflux: sync from sandbox, editrequest on talk

2016-08-20T23:22:08Z

sync from sandbox, editrequest on talk

Edokter: Change table to div, per talk

2016-04-29T21:56:50Z

Change table to div, per talk

Mr. Stradivarius: Protected Module:Shortcut: High-risk Lua module ([Edit=Allow only template editors and admins] (indefinite) [Move=Allow only template editors and admins] (indefinite))

2014-12-17T12:23:32Z

Protected Module:Shortcut: High-risk Lua module ([Edit=Allow only template editors and admins] (indefinite) [Move=Allow only template editors and admins] (indefinite))

Mr. Stradivarius: move messages to the config module and make categories optional

2014-12-17T12:19:00Z

move messages to the config module and make categories optional

Mr. Stradivarius: output an error message if there is nothing to display

2014-12-17T09:11:45Z

output an error message if there is nothing to display

Mr. Stradivarius: use the number of shortcuts to generate the plural for the shortcut heading, rather than the number of list items; also, don't output the heading if we don't have any shortcuts to display

2014-12-17T08:32:11Z

use the number of shortcuts to generate the plural for the shortcut heading, rather than the number of list items; also, don't output the heading if we don't have any shortcuts to display

Mr. Stradivarius: add a nocat option to suppress category output

2014-12-15T13:49:13Z

add a nocat option to suppress category output

@@ Line 37: / Line 37: @@
 	local listItems = {}
 	for i, shortcut in ipairs(shortcuts) do
-		listItems[i] = string.format('[[%s]]', shortcut)
+		listItems[i] = frame:expandTemplate{
 	end
 	table.insert(listItems, options.msg)

@@ Line 94: / Line 94: @@
 	for i, item in ipairs(listItems) do
 		shortcutList:tag('li'):wikitext(item)
 	end

@@ Line 102: / Line 102: @@
 	then
 		local title = mw.title.new(shortcuts[1])
-		if not title or not title.exists then
+		if not title or (not title.exists and title.interwiki == '') then
 			root:wikitext(makeCategoryLink(cfg['first-parameter-error-category']))
 		end

@@ Line 78: / Line 78: @@
 	-- Shortcut box
 	local shortcutList = root
-		:tag('table')
+		:tag('div')
-			:addClass('shortcutbox noprint')
+			:addClass('shortcutbox plainlist noprint')
 			:css('float', 'right')
 			:css('border', '1px solid #aaa')
 			:css('background', '#fff')
 			:css('margin', '.3em .3em .3em 1em')
-			:css('padding', '3px')
+			:css('padding', '.4em .6em')
 			:css('text-align', 'center')
-				:tag('tr')
+			:css('font-size', 'smaller')
-					:tag('th')
+			:css('line-height', '2em')
-						:addClass('plainlist')
+			:css('font-weight', 'bold')
-						:css('border', 'none')
+			:wikitext(shortcutHeading)
-						:css('background', 'transparent')
+				:tag('ul')
 	for i, item in ipairs(listItems) do
 		shortcutList:tag('li'):wikitext(item)

@@ Line 5: / Line 5: @@
 -- Load required modules
 local yesno = require('Module:Yesno')
 local p = {}
 function p._main(shortcuts, options, frame, cfg)
@@ Line 16: / Line 24: @@
 	frame = frame or mw.getCurrentFrame()
 	cfg = cfg or mw.loadData(CONFIG_MODULE)
 	-- Validate shortcuts
 	for i, shortcut in ipairs(shortcuts) do
 		if type(shortcut) ~= 'string' or #shortcut < 1 then
-			error(string.format(
+			error(message(cfg['invalid-shortcut-error'], i), 2)
 		end
 	end
@@ Line 37: / Line 43: @@
 	-- Return an error if we have nothing to display
 	if #listItems < 1 then
-		return '<strong class="error">Error: no shortcuts were specified ' ..
+		local msg = cfg['no-content-error']
-			'and the ' .. mw.text.nowiki('|msg=') .. ' parameter was not ' ..
+		msg = string.format('<strong class="error">%s</strong>', msg)
-			'set.</strong>'
+		if isCategorized and cfg['no-content-error-category'] then
 	end
@@ Line 61: / Line 70: @@
 		local nShortcuts = #shortcuts
 		if nShortcuts > 0 then
-			shortcutHeading = mw.message.newRawMessage(
+			shortcutHeading = message(cfg['shortcut-heading'], nShortcuts)
 			shortcutHeading = frame:preprocess(shortcutHeading)
 			shortcutHeading = shortcutHeading .. '\n'
@@ Line 92: / Line 98: @@
 	end
-	-- Error category
+	-- Output an error category if the first shortcut doesn't exist
-	if shortcuts[1] and not yesno(options.nocat) then
+	if isCategorized
 		local title = mw.title.new(shortcuts[1])
 		if not title or not title.exists then
-			root:wikitext(string.format(
+			root:wikitext(makeCategoryLink(cfg['first-parameter-error-category']))
 		end
 	end

← Older revision	Revision as of 17:56, 11 August 2017
(No difference)

← Older revision	Revision as of 12:23, 17 December 2014
(No difference)

@@ Line 34: / Line 34: @@
 	end
 	table.insert(listItems, options.msg)
 	-- Exit if we have nothing to display
-	if nListItems < 1 then
+	if #listItems < 1 then
 		return nil
 	end
@@ Line 56: / Line 55: @@
 	-- Shortcut heading
-	local shortcutHeading = mw.message.newRawMessage(
+	local shortcutHeading
-		cfg['shortcut-heading'],
+	do
-		nListItems
+		local nShortcuts = #shortcuts
-	):plain()
+		if nShortcuts > 0 then
-	shortcutHeading = frame:preprocess(shortcutHeading)
+			shortcutHeading = mw.message.newRawMessage(
 	-- Shortcut box
@@ Line 79: / Line 85: @@
 						:tag('small')
 							:wikitext(shortcutHeading)
 							:tag('ul')
 	for i, item in ipairs(listItems) do