Skip to content

Commit

Permalink
Merge branch 'main' into transfer
Browse files Browse the repository at this point in the history
  • Loading branch information
hjpalpha authored Oct 14, 2024
2 parents db71589 + 4daa460 commit cdcb85e
Show file tree
Hide file tree
Showing 287 changed files with 4,596 additions and 7,204 deletions.
6 changes: 3 additions & 3 deletions components/auto_inline_icon/commons/auto_inline_icon.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

local Class = require('Module:Class')
local Lua = require('Module:Lua')
local InlineIconAndText = require('Module:Widget/InlineIconAndText')
local InlineIconAndText = require('Module:Widget/Misc/InlineIconAndText')
local ManualData = Lua.requireIfExists('Module:InlineIcon/ManualData', {loadData = true})

local AutoInlineIcon = {}
Expand Down Expand Up @@ -58,14 +58,14 @@ end
---@return IconWidget
function AutoInlineIcon._iconCreator(data)
if data.iconType == 'image' then
local IconImage = require('Module:Widget/Icon/Image')
local IconImage = require('Module:Widget/Image/Icon/Image')
return IconImage{
imageLight = data.iconLight,
imageDark = data.iconDark,
link = data.link,
}
elseif data.iconType == 'fa' then
local IconFa = require('Module:Widget/Icon/Fontawesome')
local IconFa = require('Module:Widget/Image/Icon/Fontawesome')
return IconFa{
iconName = data.icon,
link = data.link,
Expand Down
10 changes: 5 additions & 5 deletions components/infobox/commons/custom/infobox_person_user_custom.lua
Original file line number Diff line number Diff line change
Expand Up @@ -51,18 +51,18 @@ function CustomInjector:parse(id, widgets)
)
if not String.isEmpty(args['fav-team-1']) then
Array.appendWith(widgets,
Title{name = 'Favorite Teams'},
Center{content = {self.caller:_getFavouriteTeams()}}
Title{children = 'Favorite Teams'},
Center{children = {self.caller:_getFavouriteTeams()}}
)
end
elseif
id == 'history' and
not (String.isEmpty(args.team_history) and String.isEmpty(args.clan_history))
then
return {
Title{ name = 'History' },
Center{content = {args.team_history}},
Center{content = {args.clan_history}},
Title{children = 'History' },
Center{children = {args.team_history}},
Center{children = {args.clan_history}},
}
end

Expand Down
6 changes: 3 additions & 3 deletions components/infobox/commons/infobox_building.lua
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ function Building:createInfobox()
subHeader = self:subHeaderDisplay(args),
size = args.imagesize,
},
Center{content = {args.caption}},
Title{name = (args.informationType or 'Building') .. ' Information'},
Center{children = {args.caption}},
Title{children = (args.informationType or 'Building') .. ' Information'},
Cell{name = 'Built by', content = {args.builtby}},
Customizable{
id = 'cost',
Expand Down Expand Up @@ -93,7 +93,7 @@ function Building:createInfobox()
}
},
Customizable{id = 'custom', children = {}},
Center{content = {args.footnotes}},
Center{children = {args.footnotes}},
}

self:categories('Buildings')
Expand Down
2 changes: 1 addition & 1 deletion components/infobox/commons/infobox_campaign.lua
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function Campaign:createInfobox()
imageDark = args.imagedark or args.imagedarkmode,
size = args.imagesize,
},
Center{content = {args.caption}},
Center{children = {args.caption}},
}

self:categories('Campaign')
Expand Down
6 changes: 3 additions & 3 deletions components/infobox/commons/infobox_campaign_mission.lua
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ function Mission:createInfobox()
},
}
},
Center{content = {args.caption}},
Title{name = 'Mission Information'},
Center{children = {args.caption}},
Title{children = 'Mission Information'},
Breakdown{
children = {'Mission Objective'},
classes = {'infobox-header', 'wiki-backgroundcolor-light', 'infobox-header-3'}
},
Breakdown{children = { args.objective }},
Customizable{id = 'custom', children = {}},
Center{content = {args.footnotes}},
Center{children = {args.footnotes}},
}

if Namespace.isMain() then
Expand Down
6 changes: 3 additions & 3 deletions components/infobox/commons/infobox_character.lua
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ function Character:createInfobox()
imageDefaultDark = args.defaultdark or args.defaultdarkmode,
size = args.imagesize,
},
Center{content = {args.caption}},
Title{name = (args.informationType or 'Character') .. ' Information'},
Center{children = {args.caption}},
Title{children = (args.informationType or 'Character') .. ' Information'},
Cell{name = 'Real Name', content = {args.realname}},
Customizable{
id = 'country',
Expand Down Expand Up @@ -87,7 +87,7 @@ function Character:createInfobox()
}
},
Customizable{id = 'custom', children = {}},
Center{content = {args.footnotes}},
Center{children = {args.footnotes}},
}

if Namespace.isMain() then
Expand Down
10 changes: 5 additions & 5 deletions components/infobox/commons/infobox_company.lua
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ function Company:createInfobox()
imageDark = args.imagedark or args.imagedarkmode,
size = args.imagesize,
},
Center{content = {args.caption}},
Title{name = 'Company Information'},
Center{children = {args.caption}},
Title{children = 'Company Information'},
Customizable{id = 'parent', children = {
Cell{
name = 'Parent Company',
Expand Down Expand Up @@ -85,14 +85,14 @@ function Company:createInfobox()
end
end
},
Center{content = {args.footnotes}},
Center{children = {args.footnotes}},
Builder{
builder = function()
local links = Links.transform(args)
if not Table.isEmpty(links) then
return {
Title{name = 'Links'},
Widgets.Links{content = links}
Title{children = 'Links'},
Widgets.Links{links = links}
}
end
end
Expand Down
4 changes: 2 additions & 2 deletions components/infobox/commons/infobox_cosmetic.lua
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ function Cosmetic:createInfobox()
Customizable{
id = 'caption',
children = {
Center{content = {args.caption}},
Center{children = {args.caption}},
}
},
Customizable{id = 'custom', children = {}},
Center{content = {args.footnotes}},
Center{children = {args.footnotes}},
}

self:categories('Cosmetics')
Expand Down
10 changes: 5 additions & 5 deletions components/infobox/commons/infobox_game.lua
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ function Game:createInfobox()
imageDark = args.imagedark or args.imagedarkmode,
size = args.imagesize,
},
Center{content = {args.caption}},
Title{name = 'Game Information'},
Center{children = {args.caption}},
Title{children = 'Game Information'},
Customizable{
id = 'developer',
children = {
Expand Down Expand Up @@ -101,13 +101,13 @@ function Game:createInfobox()
builder = function()
if not Table.isEmpty(links) then
return {
Title{name = 'Links'},
Widgets.Links{content = links}
Title{children = 'Links'},
Widgets.Links{links = links}
}
end
end
},
Center{content = {args.footnotes}},
Center{children = {args.footnotes}},
}

if Namespace.isMain() then
Expand Down
16 changes: 8 additions & 8 deletions components/infobox/commons/infobox_item.lua
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ function Item:createInfobox()
Customizable{
id = 'caption',
children = {
Center{content = {args.caption}},
Center{children = {args.caption}},
}
},
Customizable{
id = 'info',
children = {
Title{name = 'Item Information'},
Title{children = 'Item Information'},
Cell{name = 'Type', content = {args.type}},
Cell{name = 'Rarity', content = {args.rarity}},
Cell{name = 'Level', content = {args.level}},
Expand All @@ -68,35 +68,35 @@ function Item:createInfobox()
Customizable{
id = 'attributes',
children = {
Title{name = 'Attributes'},
Title{children = 'Attributes'},
}
},
Customizable{
id = 'ability',
children = {
Title{name = 'Ability'},
Title{children = 'Ability'},
}
},
Customizable{
id = 'availability',
children = {
Title{name = 'Availability'},
Title{children = 'Availability'},
}
},
Customizable{
id = 'maps',
children = {
Title{name = 'Maps'},
Title{children = 'Maps'},
}
},
Customizable{
id = 'recipe',
children = {
Title{name = 'Recipe'},
Title{children = 'Recipe'},
}
},
Customizable{id = 'custom', children = {}},
Center{content = {args.footnotes}},
Center{children = {args.footnotes}},
}

self:categories('Items')
Expand Down
14 changes: 7 additions & 7 deletions components/infobox/commons/infobox_league.lua
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ function League:createInfobox()
imageDark = args.imagedark or args.imagedarkmode,
size = args.imagesize,
},
Center{content = {args.caption}},
Title{name = 'League Information'},
Center{children = {args.caption}},
Title{children = 'League Information'},
Cell{
name = 'Series',
content = {
Expand Down Expand Up @@ -196,22 +196,22 @@ function League:createInfobox()
builder = function()
if Table.isNotEmpty(self.links) then
return {
Title{name = 'Links'},
Widgets.Links{content = self.links}
Title{children = 'Links'},
Widgets.Links{links = self.links}
}
end
end
},
Customizable{id = 'customcontent', children = {}},
Center{content = {args.footnotes}},
Center{children = {args.footnotes}},
Customizable{id = 'chronology', children = {
Builder{
builder = function()
if self:_isChronologySet(args.previous, args.next) then
return {
Title{name = 'Chronology'},
Title{children = 'Chronology'},
Chronology{
content = Table.filterByKey(args, function(key)
links = Table.filterByKey(args, function(key)
return type(key) == 'string' and (key:match('^previous%d?$') ~= nil or key:match('^next%d?$') ~= nil)
end)
}
Expand Down
4 changes: 2 additions & 2 deletions components/infobox/commons/infobox_lore.lua
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ function Cosmetic:createInfobox()
Customizable{
id = 'caption',
children = {
Center{content = {args.caption}},
Center{children = {args.caption}},
}
},
Customizable{id = 'custom', children = {}},
Center{content = {args.footnotes}},
Center{children = {args.footnotes}},
}

self:categories('Lore')
Expand Down
6 changes: 3 additions & 3 deletions components/infobox/commons/infobox_manufacturer.lua
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ function Manufacturer:createInfobox()
Customizable{
id = 'caption',
children = {
Center{content = {args.caption}},
Center{children = {args.caption}},
}
},
Title{name = (args.informationType or 'Manufacturer') .. ' Information'},
Title{children = (args.informationType or 'Manufacturer') .. ' Information'},
Cell{name = 'Former Name(s)', content = {args.formernames}},
Cell{name = 'Description', content = {args.description}},
Cell{name = 'Season(s)', content = {args.seasons}},
Expand All @@ -61,7 +61,7 @@ function Manufacturer:createInfobox()
builder = function()
if args.founded or args.dissolved then
return {
Title{name = 'History'},
Title{children = 'History'},
Cell{name = 'Founded', content = {args.founded}},
Cell{name = 'Dissolved', content = {args.dissolved}}
}
Expand Down
6 changes: 3 additions & 3 deletions components/infobox/commons/infobox_map.lua
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@ function Map:createInfobox()
imageDark = args.imagedark or args.imagedarkmode,
size = args.imagesize,
},
Center{content = {args.caption}},
Title{name = (args.informationType or 'Map') .. ' Information'},
Center{children = {args.caption}},
Title{children = (args.informationType or 'Map') .. ' Information'},
Cell{name = 'Creator', content = self.creators, options = {makeLink = true}},
Customizable{id = 'location', children = {
Cell{name = 'Location', content = {args.location}}
}},
Cell{name = 'Release Date', content = {args.releasedate}},
Customizable{id = 'custom', children = {}},
Center{content = {args.footnotes}},
Center{children = {args.footnotes}},
}

if Namespace.isMain() then
Expand Down
14 changes: 7 additions & 7 deletions components/infobox/commons/infobox_patch.lua
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ function Patch:createInfobox()
imageDark = args.imagedark or args.imagedarkmode,
size = args.imagesize,
},
Center{content = {args.caption}},
Title{name = (self:getInformationType(args)) .. ' Information'},
Center{children = {args.caption}},
Title{children = (self:getInformationType(args)) .. ' Information'},
Cell{name = 'Version', content = {args.version}},
Customizable{id = 'release', children = {
Cell{name = 'Release', content = {args.release}},
Expand All @@ -60,8 +60,8 @@ function Patch:createInfobox()
local highlights = self:getAllArgsForBase(args, 'highlight')
if not Table.isEmpty(highlights) then
return {
Title{name = 'Highlights'},
Highlights{content = highlights}
Title{children = 'Highlights'},
Highlights{children = highlights}
}
end
end
Expand All @@ -71,16 +71,16 @@ function Patch:createInfobox()
local chronologyData = self:getChronologyData(args)
if not Table.isEmpty(chronologyData) then
return {
Title{name = 'Chronology'},
Title{children = 'Chronology'},
Chronology{
content = chronologyData
links = chronologyData
}
}
end
end
},
Customizable{id = 'customcontent', children = {}},
Center{content = {args.footnotes}},
Center{children = {args.footnotes}},
}

if Namespace.isMain() and not Logic.readBool(Variables.varDefault('disable_LPDB_storage')) then
Expand Down
Loading

0 comments on commit cdcb85e

Please sign in to comment.