Module:Navbox: Difference between revisions

In this edit I have made some changes
m (1 revision)
 
(In this edit I have made some changes)
Line 6: Line 6:
   
   
local HtmlBuilder = require('Module:HtmlBuilder')
local HtmlBuilder = require('Module:HtmlBuilder')
local navbar = require('Module:Navbar')._navbar
local Navbar = require('Module:Navbar')


local args
local args
Line 50: Line 50:
         -- also no show/hide link, then we need a spacer on the right to achieve the left shift.
         -- also no show/hide link, then we need a spacer on the right to achieve the left shift.
         if args.state == 'plain' then spacerSide = 'right' end
         if args.state == 'plain' then spacerSide = 'right' end
     elseif args.navbar == 'plain' or (not args.name and mw.getCurrentFrame():getParent():getTitle() == 'Template:Navbox' and (border == 'subgroup' or border == 'child' or border == 'none')) then
     elseif args.navbar == 'plain' or args.navbar == 'off' or (not args.name and (border == 'subgroup' or border == 'child' or border == 'none')) then
         -- No navbar. Need a spacer on the left to balance out the width of the show/hide link.
         -- No navbar. Need a spacer on the left to balance out the width of the show/hide link.
         if args.state ~= 'plain' then spacerSide = 'left' end
         if args.state ~= 'plain' then spacerSide = 'left' end
Line 58: Line 58:
         if args.state == 'plain' then spacerSide = 'right' end
         if args.state == 'plain' then spacerSide = 'right' end


         titleCell.wikitext(navbar{  
         titleCell.wikitext(Navbar.navbar({  
             args.name,  
             args.name,  
             mini = 1,  
             mini = 1,  
             fontstyle = (args.basestyle or '') .. ';' .. (args.titlestyle or '') ..  ';background:none transparent;border:none;'
             fontstyle = (args.basestyle or '') .. ';' .. (args.titlestyle or '') ..  ';background:none transparent;border:none;'
         })
         }))
     end
     end
      
      
Line 386: Line 386:
     -- them false too.
     -- them false too.
     local args = {}
     local args = {}
     local parentTitle = frame:getParent():getTitle()
     local parent_args = frame:getParent().args;
    local frame_args = (parentTitle == 'Template:Navbox' or parentTitle == 'Template:Navbox/sandbox') and frame:getParent().args or frame.args;


     -- Out of order parsing bug.
     -- Out of order parsing bug.
     local temp;
     local temp;
     temp = frame_args.title;
     temp = parent_args.title;
     temp = frame_args.above;
     temp = parent_args.above;
     for i = 1, 20 do
     for i = 1, 20 do
         temp = frame_args["group" .. tostring(i)];
         temp = parent_args["group" .. tostring(i)];
         temp = frame_args["list" .. tostring(i)];
         temp = parent_args["list" .. tostring(i)];
     end     
     end     
     temp = frame_args.below;
     temp = parent_args.below;
      
      
     for k, v in pairs(frame_args) do
     for k, v in pairs(parent_args) do
         if v ~= '' then
         if v ~= '' then
             args[k] = v
             args[k] = v
14,061

edits