From fdd61244f9d9ead82ab9ba13b812fff200448b28 Mon Sep 17 00:00:00 2001
From: ezsh <ezsh.junk@gmail.com>
Date: Tue, 31 Mar 2020 00:33:46 +0200
Subject: [PATCH] Fix and add tabbar divs
Fix class name in RA UI (class name was changed by da823554), add tab
bars for options and slave interact..
Fixes #1661.
---
src/js/rulesAssistantOptions.js | 2 +-
src/npc/slaveStats.tw | 18 ++++++++--------
src/personalAssistant/assistantOptions.tw | 17 +++++++--------
src/uncategorized/options.tw | 14 ++++++-------
src/uncategorized/remoteSurgery.tw | 14 +++++++------
src/uncategorized/slaveInteract.tw | 24 ++++++++++++----------
src/uncategorized/underperformingSlaves.tw | 10 ++++-----
7 files changed, 52 insertions(+), 47 deletions(-)
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index 3482e9d64cb..b3fa4b180e2 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -1562,7 +1562,7 @@ window.rulesAssistantOptions = (function() {
const element = document.createElement("div");
element.className = "ra-setters";
this.tabButtons_ = document.createElement("div");
- this.tabButtons_.className = "tab";
+ this.tabButtons_.className = "tabbar";
element.appendChild(this.tabButtons_);
return element;
}
diff --git a/src/npc/slaveStats.tw b/src/npc/slaveStats.tw
index b3ad5f10e0d..689bb699756 100644
--- a/src/npc/slaveStats.tw
+++ b/src/npc/slaveStats.tw
@@ -71,15 +71,15 @@ Income: <<= num($activeSlave.lifetimeRepIncome)>>
Expenses: <<= num($activeSlave.lastWeeksRepExpenses)>>,
Income: <<= num($activeSlave.lastWeeksRepIncome)>>
-<br>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Skills')" id="tab Skills">Skills</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Mental')" id="tab Mental">Mental</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Body')" id="tab Body">Body</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Porn')" id="tab Porn">Porn</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Impants_Piercings_Tattoos')" id="tab Impants_Piercings_Tattoos">Impants, piercings & Tattoos</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Family')" id="tab Family">Family</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Misc')" id="tab Misc">Misc</button>
-<br>
+<div class="tabbar">
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Skills')" id="tab Skills">Skills</button>
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Mental')" id="tab Mental">Mental</button>
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Body')" id="tab Body">Body</button>
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Porn')" id="tab Porn">Porn</button>
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Impants_Piercings_Tattoos')" id="tab Impants_Piercings_Tattoos">Impants, piercings & Tattoos</button>
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Family')" id="tab Family">Family</button>
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Misc')" id="tab Misc">Misc</button>
+</div>
<div id="Skills" class="tabcontent">
<div class="content">
diff --git a/src/personalAssistant/assistantOptions.tw b/src/personalAssistant/assistantOptions.tw
index a61b86918b6..6fd3131b26a 100644
--- a/src/personalAssistant/assistantOptions.tw
+++ b/src/personalAssistant/assistantOptions.tw
@@ -34,14 +34,15 @@ Seated at your desk, you glance at the visual representation of
<br><br>
<<run App.UI.tabbar.handlePreSelectedTab($tabChoice.Assistant)>>
-
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'upgrades')" id="tab upgrades">Computer Core Upgrades</button>
-<<if $week >= 11>>
- <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'settings')" id="tab settings">Settings</button>
- <<if $assistant.personality != 0>>
- <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'appearance')" id="tab appearance">Appearance</button>
+<div class="tabbar">
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'upgrades')" id="tab upgrades">Computer Core Upgrades</button>
+ <<if $week >= 11>>
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'settings')" id="tab settings">Settings</button>
+ <<if $assistant.personality != 0>>
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'appearance')" id="tab appearance">Appearance</button>
+ <</if>>
<</if>>
-<</if>>
+</div>
<div id="upgrades" class="tabcontent">
<div class="content">
@@ -1074,4 +1075,4 @@ Seated at your desk, you glance at the visual representation of
<</if>>
<</if>>
</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index 32670ed035e..88a36a5a7d1 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -89,13 +89,13 @@ This save was created using FC version $ver build $releaseID.
<<run App.UI.tabbar.handlePreSelectedTab($tabChoice.Options)>>
-<br>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Display')" id="tab Display">Display</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'CONTENT&FLAVOR')" id="tab CONTENT&FLAVOR">Content & flavour</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'MODS')" id="tab MODS">Mods</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'DEBUG/CHEATING')" id="tab DEBUG/CHEATING">Debug/cheating</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Experimental')" id="tab Experimental">Experimental</button>
-<br>
+<div class="tabbar">
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Display')" id="tab Display">Display</button>
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'CONTENT&FLAVOR')" id="tab CONTENT&FLAVOR">Content & flavour</button>
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'MODS')" id="tab MODS">Mods</button>
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'DEBUG/CHEATING')" id="tab DEBUG/CHEATING">Debug/cheating</button>
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Experimental')" id="tab Experimental">Experimental</button>
+</div>
<div id="Display" class="tabcontent">
<div class="content">
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 7ca66420eae..53a8e26e160 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -72,12 +72,14 @@
<</if>>
</div>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'hairFace')" id="tab hairFace">Hair and face</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'upper')" id="tab upper">Upper</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'lower')" id="tab lower">Lower</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Race')" id="tab Race">Race</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Structural')" id="tab Structural">Structural</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'ExtremeSurgery')" id="tab ExtremeSurgery">ExtremeSurgery</button>
+<div class="tabbar">
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'hairFace')" id="tab hairFace">Hair and face</button>
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'upper')" id="tab upper">Upper</button>
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'lower')" id="tab lower">Lower</button>
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Race')" id="tab Race">Race</button>
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Structural')" id="tab Structural">Structural</button>
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'ExtremeSurgery')" id="tab ExtremeSurgery">ExtremeSurgery</button>
+</div>
<div id="hairFace" class="tabcontent">
<div class="content">
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 43864863a58..3497c1e55a2 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -80,16 +80,18 @@
[E,→]
</span>
</p>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Description'), App.UI.replace('#LSD', '_desc')" id="tab Description">Description</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Location')" id="tab Location">Location</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Appearance'), App.UI.Wardrobe.refreshAll(getSlave(V.activeSlave.ID))" id="tab Appearance">Appearance</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'PhysicalRegimen')" id="tab PhysicalRegimen">Physical Regimen</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Rules')" id="tab Rules">Rules</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Financial')" id="tab Financial">Financial</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Customize'), App.UI.SlaveInteract.custom(getSlave(V.activeSlave.ID))" id="tab Customize">Customize</button>
-<<if $familyTesting == 1>>
- <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'FamilyTab'), renderFamilyTree(V.slaves, V.activeSlave.ID)" id="tab FamilyTab">Family</button>
-<</if>>
+<div class="tabbar">
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Description'), App.UI.replace('#LSD', '_desc')" id="tab Description">Description</button>
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Location')" id="tab Location">Location</button>
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Appearance'), App.UI.Wardrobe.refreshAll(getSlave(V.activeSlave.ID))" id="tab Appearance">Appearance</button>
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'PhysicalRegimen')" id="tab PhysicalRegimen">Physical Regimen</button>
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Rules')" id="tab Rules">Rules</button>
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Financial')" id="tab Financial">Financial</button>
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Customize'), App.UI.SlaveInteract.custom(getSlave(V.activeSlave.ID))" id="tab Customize">Customize</button>
+ <<if $familyTesting == 1>>
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'FamilyTab'), renderFamilyTree(V.slaves, V.activeSlave.ID)" id="tab FamilyTab">Family</button>
+ <</if>>
+</div>
<div id="artFrame">
<<if $seeImages == 1 && $eventDescription != 1>>
@@ -690,4 +692,4 @@
</p>
<</if>>
</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/uncategorized/underperformingSlaves.tw b/src/uncategorized/underperformingSlaves.tw
index a6182dbb49c..170d9cd73ed 100644
--- a/src/uncategorized/underperformingSlaves.tw
+++ b/src/uncategorized/underperformingSlaves.tw
@@ -20,10 +20,10 @@
</div>
</p>
<<run App.UI.tabbar.handlePreSelectedTab($tabChoice.Options)>>
-
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'highSale')" id="tab highSale">Worth much but earning little</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'expensive')" id="tab expensive">Costing vs earning</button>
-
+<div class="tabbar">
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'highSale')" id="tab highSale">Worth much but earning little</button>
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'expensive')" id="tab expensive">Costing vs earning</button>
+</div>
<div id="highSale" class="tabcontent">
<div class="content">
<div style="font-style:italic">
@@ -78,4 +78,4 @@
).get(0)
)>>
</div>
-</div>
\ No newline at end of file
+</div>
--
GitLab