Module:FBI QR code: Difference between revisions

← Older edit Newer edit →

@@ Line 1: / Line 1: @@
+local args = {}
 local p = {}
@@ Line 23: / Line 25: @@
 -- for the specified prefix. For example, if the prefix was 'data', and
 -- 'data1', 'data2', and 'data5' exist, it would return {1, 2, 5}.
-local function getArgNums(prefix, args)
+local function getArgNums(prefix)
 	local nums = {}
 	for k, v in pairs(args) do
@@ Line 33: / Line 35: @@
 end
-function p.makeSections(frame, args)
+function p.makeSections(frame)
 	local sections = {}
-	local nums = union(getArgNums('name', args), getArgNums('url', args))
+	local nums = union(getArgNums('name'), getArgNums('url'))
 	for k, v in ipairs(nums) do
-		local name = args['name' .. tostring(v)]
+		local name = args['name' .. tostring(num)]
-		local url = args['url' .. tostring(v)]
+		local url = args['name' .. tostring(num)]
 		if name and url then
-			local qr = frame:expandTemplate( { title = 'qrlite', args = { url, format = 'png', margin = '3' } } )
+			local qr = frame:callParserFunction('#qrlite', {url, format = 'svg', margin = '3'})
-			table.insert(sections, {name, '<p class="hb-qrcode-image">'..qr..'</p><p class="hb-qrcode-link">['..url..' '..url..']</p>'})
+			table.insert(sections, {name, qr..frame:preprocess('<br>['..url..' '..url..']')})
 		end
 	end
@@ Line 49: / Line 51: @@
 end
-function p.makeTabberData(sections)
+function p.makeTabber(sections)
-	local finalSections = ''
+	local tabber = mw.html.create('tabber')
 	for k, v in ipairs(sections) do
-		finalSections = finalSections..'|-|'..v[1]..'='..v[2]
+		tabber:wikitext('|-|'..v[1]..'=\n\n', v[2])
 	end
-	return finalSections
+	return tostring(tabber)
-end
-function p.makeTabber(frame, sections)
-	return frame:callParserFunction('#tag', 'tabber', p.makeTabberData(sections))
 end
 function p.main(frame)
 	local parent = frame:getParent()
+	-- adapted from [[Module:Infobox]]
+	if frame == mw.getCurrentFrame() then
+		args = frame:getParent().args
+	else
+		args = frame
+	end
-	local sections = p.makeSections(parent, parent.args)
+	local sections = p.makeSections(parent)
-	return p.makeTabber(parent, sections)
+	return p.makeTabber(sections)
-end
-function p.template(frame)
-	local args = {}
-	for k,v in pairs(frame.args) do args[k] = mw.text.trim(v) end
-	local sections = p.makeSections(frame, args)
-	return p.makeTabber(frame, sections)
 end
 return p