From 566d46413d981abd6e42e480afbe7cd62551cd1a Mon Sep 17 00:00:00 2001
From: MouseOfLight <MouseOfLight@gmail.com>
Date: Sun, 20 Oct 2019 01:55:26 -0700
Subject: [PATCH] Added an option for double columns
---
src/uncategorized/buildingWidgets.tw | 52 ++++++++++++++++++++--------
src/uncategorized/options.tw | 11 +++---
2 files changed, 44 insertions(+), 19 deletions(-)
diff --git a/src/uncategorized/buildingWidgets.tw b/src/uncategorized/buildingWidgets.tw
index d0cdc78b006..ba49b9351f0 100644
--- a/src/uncategorized/buildingWidgets.tw
+++ b/src/uncategorized/buildingWidgets.tw
@@ -57,11 +57,28 @@ Yes, I am aware this is horrible. If anyone can figure out how to get widgets to
td#Nursery { border-color: deepskyblue; }
.arcology .penthouse {
- display:inline-block;
+ display: inline-block;
+ }
+ .arcology .penthouse .info:before { content: "("; }
+ .arcology .penthouse .info:after { content: ")"; }
+ .arcology .penthouseWrapper {
+ display: inline-block;
}
.arcology.verticalLinks .penthouse{
display:block;
}
+ .arcology.verticalLinks2 .penthouseWrapper {
+ display: grid;
+ grid-template-columns: repeat(2, 1fr);
+ }
+ .arcology.verticalLinks2 .penthouse .info:before,
+ .arcology.verticalLinks2 .penthouse .info:after {
+ content: "";
+ }
+ .arcology.verticalLinks2 .penthouse .info {
+ display: block;
+ line-height: 0.75;
+ }
</style>
<<script>>
@@ -144,69 +161,76 @@ if(!Macro.has('sectorblock')) {
<</script>>
<center>
<<set _arcologyTableClass = "arcology">>
-<<if $verticalizeArcologyLinks>><<set _arcologyTableClass += " verticalLinks">><</if>>
+<<switch $verticalizeArcologyLinks>>
+ <<case 1 true>>
+ <<set _arcologyTableClass += " verticalLinks">>
+ <<case 2>>
+ <<set _arcologyTableClass += " verticalLinks2">>
+<</switch>>
<table @class="_arcologyTableClass">
<tr> /* Level 9, penthouse, sector 0 */
<td colspan="3"></td>
<td id="Penthouse" colspan="4">
<span class="penthouse">
- <<link "Penthouse">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Penthouse">><</link>> @@.cyan;[P]@@
+ <<link "Penthouse">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Penthouse">><</link>> @@.cyan;[P]@@
</span>
+ <div class="penthouseWrapper">
<<if $masterSuite>>
<span class="penthouse masterSuite">
- <<print MasterSuiteUIName()>> ($MastSiIDs.length/$masterSuite<<if $Concubine>>, C<</if>>)
+ <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">
- <<print HeadGirlSuiteUIName()>> <<if $HeadGirl != 0>>(HG<<if $HGSuiteiIDs.length > 0>>, 1)<<else>>)<</if>><</if>>
+ <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">
- [[Armory|BG Select]] <<if $Bodyguard != 0>>(BG)<</if>>
+ <span class="name">[[Armory|BG Select]]</span><<if $Bodyguard != 0>> <span class="info">BG</span><</if>>
</span>
<</if>>
<<if $servantsQuarters>>
<span class="penthouse servantsQuarters">
- <<print ServantQuartersUIName()>> ($ServQiIDs.length/$servantsQuarters<<if $Stewardess>>, L<</if>>)
+ <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">
- <<print SpaUIName()>> ($SpaiIDs.length/$spa<<if $Attendant>>, L<</if>>)
+ <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">
- <<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>>
+ <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">
- <<print ClinicUIName()>> ($CliniciIDs.length/$clinic<<if $Nurse>>, L<</if>>)
+ <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">
- <<print SchoolRoomUIName()>> ($SchlRiIDs.length/$schoolroom<<if $Schoolteacher>>, L<</if>>)
+ <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">
- <<print CellblockUIName()>> ($CellBiIDs.length/$cellblock<<if $Wardeness>>, L<</if>>)
+ <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">
- <<print IncubatorUIName()>> (<<=numberWithPluralOne($incubator-$tanks.length, "empty tank")>>) <<if $readySlaves > 0>>@@.yellow;[!]@@<</if>>
+ <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">
- [[Prosthetic Lab]]
+ <span class="name">[[Prosthetic Lab]]</span>
</span>
<</if>>
+ </div>
</td>
<td colspan="3"></td>
</tr>
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index 78e42db3508..31f112d56cf 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -169,11 +169,12 @@ 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 2 "Double Column">>
+ <<option 1 "Single Column">>
+ <<option 0 "Collapsed">>
+ <</options>>
<<options $seeArcology>>
Main menu arcology description
--
GitLab