Merge branch 'hide-unused-tabs' into 'pregmod-master'

Hide unused tabs

See merge request !4038

src/uncategorized/main.tw

@@ -111,66 +111,67 @@ __''MAIN MENU''__    //[[Summary Options]]//
 		<<if $useSlaveSummaryOverviewTab == 1>>
 		<button class="tablinks" onclick="opentab(event, 'overview')" id="tab overview">Overview</button>
 		<</if>>
-		<button class="tablinks" onclick="opentab(event, 'resting')" id="tab resting">
+		<button class="tablinks" onclick="opentab(event, 'resting')" id="tab resting"> /*leaving resting always on as it changes a lot from week to week. */
 			Resting
 			<<if $JobIDArray['rest'].length > 0>>
 				($JobIDArray['rest'].length)
 			<</if>>
 		</button>
-		<button class="tablinks" onclick="opentab(event, 'stay confined')" id="tab stay confined">
-			Confined
-			<<if $JobIDArray['stay confined'].length > 0>>
+		<<if $JobIDArray['stay confined'].length > 0>>
+			<button class="tablinks" onclick="opentab(event, 'stay confined')" id="tab stay confined">
+				Confined
 				($JobIDArray['stay confined'].length)
-			<</if>>
-		</button>
-		<button class="tablinks" onclick="opentab(event, 'take classes')" id="tab take classes">
-			Students
-			<<if $JobIDArray['take classes'].length > 0>>
-				($JobIDArray['take classes'].length)
-			<</if>>
-		</button>
-		<button class="tablinks" onclick="opentab(event, 'please you')" id="tab please you">
-			Fucktoys
-			<<if $JobIDArray['please you'].length > 0>>
-				($JobIDArray['please you'].length)
-			<</if>>
-		</button>
-		<button class="tablinks" onclick="opentab(event, 'whore')" id="tab whore">
-			Whores
-			<<if $JobIDArray['whore'].length > 0>>
-				($JobIDArray['whore'].length)
-			<</if>>
-		</button>
-		<button class="tablinks" onclick="opentab(event, 'serve the public')" id="tab serve the public">
-			Public Servants
-			<<if $JobIDArray['serve the public'].length > 0>>
-				($JobIDArray['serve the public'].length)
-			<</if>>
-		</button>
-		<button class="tablinks" onclick="opentab(event, 'be a servant')" id="tab be a servant">
-			Servants
-			<<if $JobIDArray['be a servant'].length > 0>>
-				($JobIDArray['be a servant'].length)
-			<</if>>
-		</button>
-		<button class="tablinks" onclick="opentab(event, 'get milked')" id="tab milked">
-			Cows
-			<<if $JobIDArray['get milked'].length > 0>>
-				($JobIDArray['get milked'].length)
-			<</if>>
-		</button>
-		<button class="tablinks" onclick="opentab(event, 'work a glory hole')" id="tab work a glory hole">
-			Gloryhole
-			<<if $JobIDArray['work a glory hole'].length > 0>>
-				($JobIDArray['work a glory hole'].length)
-			<</if>>
-		</button>
-		<button class="tablinks" onclick="opentab(event, 'be a subordinate slave')" id="tab be a subordinate slave">
-			Subordinate slaves
-			<<if $JobIDArray['be a subordinate slave'].length > 0>>
-				($JobIDArray['be a subordinate slave'].length)
-			<</if>>
-		</button>
+			</button>
+		<</if>>
+		<<if $JobIDArray['take classes'].length > 0>>
+			<button class="tablinks" onclick="opentab(event, 'take classes')" id="tab take classes">
+				Students
+				($JobIDArray['take classes'].length)				
+			</button>
+		<</if>>
+		<<if $JobIDArray['please you'].length > 0>>
+			<button class="tablinks" onclick="opentab(event, 'please you')" id="tab please you">
+				Fucktoys
+				($JobIDArray['please you'].length)				
+			</button>
+		<</if>>
+		<<if $JobIDArray['whore'].length > 0>>
+			<button class="tablinks" onclick="opentab(event, 'whore')" id="tab whore">
+				Whores
+				($JobIDArray['whore'].length)				
+			</button>
+		<</if>>
+		<<if $JobIDArray['serve the public'].length > 0>>
+			<button class="tablinks" onclick="opentab(event, 'serve the public')" id="tab serve the public">
+				Public Servants				
+				($JobIDArray['serve the public'].length)				
+			</button>
+		<</if>>
+		<<if $JobIDArray['be a servant'].length > 0>>
+			<button class="tablinks" onclick="opentab(event, 'be a servant')" id="tab be a servant">
+				Servants				
+				($JobIDArray['be a servant'].length)				
+			</button>
+		<</if>>
+		<<if $JobIDArray['get milked'].length > 0>>
+			<button class="tablinks" onclick="opentab(event, 'get milked')" id="tab milked">
+				Cows				
+				($JobIDArray['get milked'].length)				
+			</button>
+		<</if>>
+		<<if $JobIDArray['work a glory hole'].length > 0>>
+			<button class="tablinks" onclick="opentab(event, 'work a glory hole')" id="tab work a glory hole">
+				Gloryhole				
+				($JobIDArray['work a glory hole'].length)			
+			</button>
+		<</if>>
+		<<if $JobIDArray['be a subordinate slave'].length > 0>>
+			<button class="tablinks" onclick="opentab(event, 'be a subordinate slave')" id="tab be a subordinate slave">
+				Subordinate slaves
+				($JobIDArray['be a subordinate slave'].length)				
+			</button>
+		<</if>>
+
 		<button class="tablinks" onclick="opentab(event, 'all')" id="tab all">
 			All
 			<<if _penthouseSlaves > 0>>
@@ -473,23 +474,23 @@ __''MAIN MENU''__&nbsp;&nbsp;&nbsp;&nbsp;//[[Summary Options]]//
 		<script>document.getElementById("tab overview").click();</script>
 	<<elseif ($tabChoice.Main == "resting")>>
 		<script>document.getElementById("tab resting").click();</script>
-	<<elseif ($tabChoice.Main == "stay confined")>>
+	<<elseif ($tabChoice.Main == "stay confined" && $JobIDArray['stay confined'].length)>>
 		<script>document.getElementById("tab stay confined").click();</script>
-	<<elseif ($tabChoice.Main == "take classes")>>
+	<<elseif ($tabChoice.Main == "take classes") && $JobIDArray['take classes'].length>>
 		<script>document.getElementById("tab take classes").click();</script>
-	<<elseif ($tabChoice.Main == "please you")>>
+	<<elseif ($tabChoice.Main == "please you") && $JobIDArray['please you'].length>>
 		<script>document.getElementById("tab please you").click();</script>
-	<<elseif ($tabChoice.Main == "whore")>>
+	<<elseif ($tabChoice.Main == "whore" && $JobIDArray['whore'].length)>>
 		<script>document.getElementById("tab whore").click();</script>
-	<<elseif ($tabChoice.Main == "serve the public")>>
+	<<elseif ($tabChoice.Main == "serve the public") && $JobIDArray['serve the public'].length>>
 		<script>document.getElementById("tab serve the public").click();</script>
-	<<elseif ($tabChoice.Main == "be a servant")>>
+	<<elseif ($tabChoice.Main == "be a servant") && $JobIDArray['be a servant'].length>>
 		<script>document.getElementById("tab be a servant").click();</script>
-	<<elseif ($tabChoice.Main == "get milked")>>
+	<<elseif ($tabChoice.Main == "get milked") && $JobIDArray['get milked'].length>>
 		<script>document.getElementById("tab get milked").click();</script>
-	<<elseif ($tabChoice.Main == "work a glory hole")>>
+	<<elseif ($tabChoice.Main == "work a glory hole") && $JobIDArray['work a glory hole'].length>>
 		<script>document.getElementById("tab work a glory hole").click();</script>
-	<<elseif ($tabChoice.Main == "be a subordinate slave")>>
+	<<elseif ($tabChoice.Main == "be a subordinate slave") && $JobIDArray['be a subordinate slave'].length>>
 		<script>document.getElementById("tab be a subordinate slave").click();</script>
 	<<elseif ($tabChoice.Main == "all")>>
 		<script>document.getElementById("tab all").click();</script>