Skip to content
Snippets Groups Projects
Commit 9e7b678d authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'buildingWidget-update' into 'pregmod-master' 

Added a double-column display for new vertical layout

See merge request !5407
parents 43cd487f 1012a4f2
No related branches found
No related tags found
1 merge request!5407Added a double-column display for new vertical layout
Hide whitespace changes
Inline Side-by-side
src/uncategorized/buildingWidgets.tw
+ 107
− 47
View file @ 9e7b678d
......@@ -55,6 +55,44 @@ Yes, I am aware this is horrible. If anyone can figure out how to get widgets to
td#Dairy { border-color: white; }
td#Farmyard { border-color: brown; }
td#Nursery { border-color: deepskyblue; }
.arcology .penthouse {
display: inline-block;
}
.arcology .penthouse .info:before { content: "("; }
.arcology .penthouse .info:after { content: ")"; }
.arcology .penthouseWrapper {
display: inline-block;
}
.arcology.verticalLinks .penthouse{
display:block;
}
.arcology.griddedLinks .penthouseWrapper {
display: flex;
flex-wrap: wrap;
box-sizing: border-box;
}
.arcology.griddedLinks .penthouse .info:before,
.arcology.griddedLinks .penthouse .info:after {
content: "";
}
.arcology.griddedLinks .penthouse .info {
display: block;
line-height: 0.75;
margin-top: -0.2em;
margin-bottom: 0.2em;
}
.arcology.griddedLinks .penthouseWrapper .penthouse {
flex-grow: 1;
box-sizing: border-box;
justify-content: space-between;
}
.arcology.grid2 .penthouseWrapper .penthouse {
width: 45%;
}
.arcology.grid3 .penthouseWrapper .penthouse {
width: 30%;
}
</style>
<<script>>
......@@ -136,57 +174,79 @@ if(!Macro.has('sectorblock')) {
}
<</script>>
<center>
<table class="arcology">
<<set _arcologyTableClass = "arcology">>
<<switch $verticalizeArcologyLinks>>
<<case 1>>
<<set _arcologyTableClass += " verticalLinks">>
<<case 2>>
<<set _arcologyTableClass += " griddedLinks grid2">>
<<case 3>>
<<set _arcologyTableClass += " griddedLinks grid3">>
<</switch>>
<table @class="_arcologyTableClass">
<tr> /* Level 9, penthouse, sector 0 */
<td colspan="3"></td>
<td id="Penthouse" colspan="4">
<<link "Penthouse">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Penthouse">><</link>> @@.cyan;[P]@@
<<if $masterSuite||$HGSuite||$dojo||$servantsQuarters||$spa||$nursery||$clinic||$schoolroom||$cellblock||$incubator||$researchLab.level > 0>>
<<if $masterSuite>>
<<if $verticalizeArcologyLinks>><br><</if>>
<<print MasterSuiteUIName()>> ($MastSiIDs.length/$masterSuite<<if $Concubine>>, C<</if>>)
<</if>>
<<if $HGSuite>>
<<if $verticalizeArcologyLinks>><br><</if>>
<<print HeadGirlSuiteUIName()>> <<if $HeadGirl != 0>>(HG<<if $HGSuiteiIDs.length > 0>>, 1)<<else>>)<</if>><</if>>
<</if>>
<<if $dojo > 1>>
<<if $verticalizeArcologyLinks>><br><</if>>
[[Armory|BG Select]] <<if $Bodyguard != 0>>(BG)<</if>>
<</if>>
<<if $servantsQuarters>>
<<if $verticalizeArcologyLinks>><br><</if>>
<<print ServantQuartersUIName()>> ($ServQiIDs.length/$servantsQuarters<<if $Stewardess>>, L<</if>>)
<</if>>
<<if $spa>>
<<if $verticalizeArcologyLinks>><br><</if>>
<<print SpaUIName()>> ($SpaiIDs.length/$spa<<if $Attendant>>, L<</if>>)
<</if>>
<<if $nursery>>
<<if $verticalizeArcologyLinks>><br><</if>>
<<print NurseryUIName()>> (<<if $nursery-$nurseryBabies == 0>>No empty rooms<<elseif $nursery-$nurseryBabies == 1>>1 empty room<<else>><<print $nursery-$nurseryBabies>> empty rooms<</if>>, $NurseryiIDs.length/$nurseryNannies<<if $Matron>>, L<</if>>) <<if $readyChildren > 0>>@@.yellow;[!]@@<</if>>
<</if>>
<<if $clinic>>
<<if $verticalizeArcologyLinks>><br><</if>>
<<print ClinicUIName()>> ($CliniciIDs.length/$clinic<<if $Nurse>>, L<</if>>)
<</if>>
<<if $schoolroom>>
<<if $verticalizeArcologyLinks>><br><</if>>
<<print SchoolRoomUIName()>> ($SchlRiIDs.length/$schoolroom<<if $Schoolteacher>>, L<</if>>)
<</if>>
<<if $cellblock>>
<<if $verticalizeArcologyLinks>><br><</if>>
<<print CellblockUIName()>> ($CellBiIDs.length/$cellblock<<if $Wardeness>>, L<</if>>)
<</if>>
<<if $incubator>>
<<if $verticalizeArcologyLinks>><br><</if>>
<<print IncubatorUIName()>> (<<if $incubator-$incubatorSlaves == 0>>No empty tanks<<elseif $incubator-$incubatorSlaves == 1>>1 empty tank<<else>><<print $incubator-$incubatorSlaves>> empty tanks<</if>>) <<if $readySlaves > 0>>@@.yellow;[!]@@<</if>>
<</if>>
<<if $researchLab.level > 0>>
<<if $verticalizeArcologyLinks>><br><</if>>
[[Prosthetic Lab]]
<</if>>
<span class="penthouse">
<<link "Penthouse">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Penthouse">><</link>> @@.cyan;[P]@@
</span>
<div class="penthouseWrapper">
<<if $masterSuite>>
<span class="penthouse masterSuite">
<span class="name"><<print MasterSuiteUIName()>></span><span class="info">$MastSiIDs.length/$masterSuite<<if $Concubine>>, C<</if>></span>
</span>
<</if>>
<<if $HGSuite>>
<span class="penthouse headGirlSuite">
<span class="name"><<print HeadGirlSuiteUIName()>></span><<if $HeadGirl != 0>><span class="info">HG<<if $HGSuiteiIDs.length > 0>>, 1<</if>></span><</if>>
</span>
<</if>>
<<if $dojo > 1>>
<span class="penthouse armory">
<span class="name">[[Armory|BG Select]]</span><<if $Bodyguard != 0>> <span class="info">BG</span><</if>>
</span>
<</if>>
<<if $servantsQuarters>>
<span class="penthouse servantsQuarters">
<span class="name"><<print ServantQuartersUIName()>></span><span class="info">$ServQiIDs.length/$servantsQuarters<<if $Stewardess>>, L<</if>></span>
</span>
<</if>>
<<if $spa>>
<span class="penthouse spa">
<span class="name"><<print SpaUIName()>></span><span class="info">$SpaiIDs.length/$spa<<if $Attendant>>, L<</if>></span>
</span>
<</if>>
<<if $nursery>>
<span class="penthouse nursery">
<span class="name"><<print NurseryUIName()>></span><span class="info"><<= numberWithPluralOne($nursery-$nurseryBabies, "empty room")>>, $NurseryiIDs.length/$nurseryNannies<<if $Matron>>, L<</if>></span> <<if $readyChildren > 0>>@@.yellow;[!]@@<</if>>
</span>
<</if>>
<<if $clinic>>
<span class="penthouse clinic">
<span class="name"><<print ClinicUIName()>></span><span class="info">$CliniciIDs.length/$clinic<<if $Nurse>>, L<</if>></span>
</span>
<</if>>
<<if $schoolroom>>
<span class="penthouse schoolroom">
<span class="name"><<print SchoolRoomUIName()>></span><span class="info">$SchlRiIDs.length/$schoolroom<<if $Schoolteacher>>, L<</if>></span>
</span>
<</if>>
<<if $cellblock>>
<span class="penthouse cellblock">
<span class="name"><<print CellblockUIName()>></span><span class="info">$CellBiIDs.length/$cellblock<<if $Wardeness>>, L<</if>></span>
</span>
<</if>>
<<if $incubator>>
<span class="penthouse incubator">
<span class="name"><<print IncubatorUIName()>></span><span class="info"><<=numberWithPluralOne($incubator-$tanks.length, "empty tank")>></span> <<if $readySlaves > 0>>@@.yellow;[!]@@<</if>>
</span>
<</if>>
<<if $researchLab.level > 0>>
<span class="penthouse researchLab">
<span class="name">[[Prosthetic Lab]]</span>
</span>
<</if>>
</div>
</td>
<td colspan="3"></td>
</tr>
......
src/uncategorized/options.tw
+ 7
− 5
View file @ 9e7b678d
......@@ -169,11 +169,13 @@ This save was created using FC version $ver build $releaseID.
<<option 0 "Disabled">>
<</options>>
<<options $verticalizeArcologyLinks>>
Add linebreaks in the penthouse links (New Model UI)
<<option 1 "Enabled">>
<<option 0 "Disabled">>
<</options>>
<<options $verticalizeArcologyLinks>>
Penthouse Facility Display
<<option 3 "Triple Column">>
<<option 2 "Double Column">>
<<option 1 "Single Column">>
<<option 0 "Collapsed">>
<</options>>
<<options $seeArcology>>
Main menu arcology description
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment