Module:HonorChallPart - Revision history

DesignerThan at 21:28, 31 July 2021

2021-07-31T21:28:41Z

DesignerThan at 21:24, 31 July 2021

2021-07-31T21:24:48Z

DesignerThan at 21:19, 31 July 2021

2021-07-31T21:19:21Z

DesignerThan at 21:17, 31 July 2021

2021-07-31T21:17:30Z

DesignerThan at 21:14, 31 July 2021

2021-07-31T21:14:25Z

DesignerThan at 21:13, 31 July 2021

2021-07-31T21:13:24Z

DesignerThan at 21:09, 31 July 2021

2021-07-31T21:09:26Z

DesignerThan at 21:04, 31 July 2021

2021-07-31T21:04:13Z

DesignerThan at 21:03, 31 July 2021

2021-07-31T21:03:52Z

DesignerThan at 22:23, 30 July 2021

2021-07-30T22:23:17Z

@@ Line 30: / Line 30: @@
 				end
 				authAbbrev = variant['authorities'][1]['orig']
-				tabString = tabString..createNavTab( authAbbrev, tabText, isActive)
+				tabString = tabString..createNavTab( authAbbrev, tabText, isActive )
 				local reqPageLink = landingPage..'/Requirements'
@@ Line 68: / Line 68: @@
 	-- create a single tab
 	local HTMLLink = mw.html.create( 'htmltag' )
-	-- if first add css class 'active'
 	HTMLLink
 		:attr( 'tagname', 'a')
-		:addClass( 'nav-link' )
+		:addClass( 'nav-link'..isActiveCSSClass )
 		:attr( 'id', authAbbrev..'-tab' )
 		:attr( 'data-toggle', 'tab' )
@@ Line 93: / Line 99: @@
 	--create a content tab
 	local HTMLContentTab = mw.html.create( 'div' )
-	-- if first add css class 'active & show'
 	local isActiveCSSClass = ''
 	if ( isActive == true ) then

@@ Line 14: / Line 14: @@
 		if ( #reqVariants['requirements'] > 1 ) then
 			-- create tab's
 			for key, variant in pairs(reqVariants['requirements']) do
 				tabText = ''
@@ Line 28: / Line 30: @@
 				end
 				authAbbrev = variant['authorities'][1]['orig']
+				tabString = tabString..createNavTab( authAbbrev, tabText, isActive)
 				local reqPageLink = landingPage..'/Requirements'
@@ Line 43: / Line 39: @@
 				mw.log('HonorChallPart.getChallengingPart (reqPageLink): '..reqPageLink)
 				local content = frame:callParserFunction( '#lst', reqPageLink, 'challenge' )
-				local HTMLTabsContent = mw.html.create( 'div' )
+				tabContentString = tabContentString..createContentTab( authAbbrev, content, isActive )
-				HTMLTabsContent
+			end
-					:addClass( 'tab-content' )
-					:attr( 'challengeTabContent' )
+			local HTMLTabContainer = mw.html.create( 'ul' )
-					:wikitext( createContentTab( authAbbrev, content, isActive ))
+			HTMLTabContainer
-				retString = tostring( HTMLTabContainer )..tostring( HTMLTabsContent )
+			local HTMLTabsContent = mw.html.create( 'div' )
-			end
+			HTMLTabsContent
 		else
 			-- no or only 1 reqVariant's just use the default

@@ Line 6: / Line 6: @@
 	local reqVariants = honorUtils.getVariantsData( frame, nil, 'requirements', nil )
 	local landingPage = frame:expandTemplate{ title='GetHonorLandingPage' }
 	mw.log('HonorChallPart.getChallengingPart (landingPage): "'..landingPage..'"')
 	local langSuffix = frame:preprocess( '{{PAGELANGUAGE}}' )
@@ Line 40: / Line 41: @@
 				end
 				reqPageLink = reqPageLink..'/'..langSuffix
 				mw.log('HonorChallPart.getChallengingPart (reqPageLink): '..reqPageLink)
 				local content = frame:callParserFunction( '#lst', reqPageLink, 'challenge' )
@@ Line 54: / Line 54: @@
 			-- no or only 1 reqVariant's just use the default
 			local reqPageLink = landingPage..'/Requirements/'..langSuffix
 			retString = frame:callParserFunction( '#lst', reqPageLink, 'challenge' )
 		end

@@ Line 6: / Line 6: @@
 	local reqVariants = honorUtils.getVariantsData( frame, nil, 'requirements', nil )
 	local landingPage = frame:expandTemplate{ title='GetHonorLandingPage' }
 	local langSuffix = frame:preprocess( '{{PAGELANGUAGE}}' )
 	local retString = nil
@@ Line 40: / Line 41: @@
 				reqPageLink = reqPageLink..'/'..langSuffix
 				reqPageLink = mw.ustring.gsub(reqPageLink, "[\n\r]", '', 0)
-				mw.log('HonorChallPart.createContentTab (reqPageLink): '..reqPageLink)
+				mw.log('HonorChallPart.getChallengingPart (reqPageLink): '..reqPageLink)
 				local content = frame:callParserFunction( '#lst', reqPageLink, 'challenge' )
 				local HTMLTabsContent = mw.html.create( 'div' )

@@ Line 39: / Line 39: @@
 				end
 				reqPageLink = reqPageLink..'/'..langSuffix
 				mw.log('HonorChallPart.createContentTab (reqPageLink): '..reqPageLink)
 				local content = frame:callParserFunction( '#lst', reqPageLink, 'challenge' )

@@ Line 83: / Line 83: @@
 function createContentTab( authAbbrev, content, isActive )
-	mw.log('HonorChallPart.createContentTab (authAbbrev, content, isActive): '..authoAbbrev..', '..content..', '..tostring(isActive))
+	mw.log('HonorChallPart.createContentTab (authAbbrev, content, isActive): '..authAbbrev..', '..content..', '..tostring(isActive))
 	--create a content tab
 	local HTMLContentTab = mw.html.create( 'div' )

@@ Line 3: / Line 3: @@
 local utilities = require ( "Module:Utilities" )
-function p.getChallangingPart( frame )
+function p.getChallengingPart( frame )
 	local reqVariants = honorUtils.getVariantsData( frame, nil, 'requirements', nil )
-	local HTMLTabs = ""
+	local landingPage = frame:expandTemplate{ title='GetHonorLandingPage' }
-	local HTMLTabsContent = ""
+	local langSuffix = frame:preprocess( '{{PAGELANGUAGE}}' )
 	-- create a single tab
-	local HTMLACode = mw.html.create( 'a' )
+	local HTMLLink = mw.html.create( 'a' )
 	-- if first add css class 'active'
-	HTMLACode
+	HTMLLink
 		:addClass( 'nav-link' )
 		:attr( 'id', authAbbrev..'-tab' )
@@ Line 18: / Line 69: @@
 		:attr( 'role', 'tab' )
 		:attr( 'aria-controls', authAbbrev )
-		:attr( 'aria-selected', active )
+		:attr( 'aria-selected', tostring(isActive) )
-		:wikitext( authTrans )
+		:wikitext( tabText )
-	local HTMLCode = mw.html.create( 'li' )
-	HTMLCode
+	local HTMLLi = mw.html.create( 'li' )
 		:addClass( 'nav-item' )
 		:attr( 'role', 'presentation' )
-		:wikitext( tostring( HTMLACode ) )
+		:wikitext( tostring( HTMLLink ) )
-−
 	--create a content tab
-	HTMLContentTab = mw.html.create( 'div' )
+	local HTMLContentTab = mw.html.create( 'div' )
 	-- if first add css class 'active & show'
 	HTMLContentTab
-		:addClass( 'tab-pane fade' )
+		:addClass( 'tab-pane fade'..isActiveCSSClass )
 		:attr( 'id', authAbbrev )
 		:attr( 'role', 'tabpanel' )
 		:attr( 'aria-labelledby', authAbbrev..'-tab' )
-		:wikitext( 'lst string with authority' )
+		:wikitext( content )
-	-- create the container's and add the tab's
+	return tostring( HTMLContentTab )
 end
 return p