Merge branch 'next-button' into 'pregmod-master'

fix daughters of liberty again

See merge request pregmodfan/fc-pregmod!4782

src/uncategorized/storyCaption.tw

@@ -50,25 +50,22 @@
 		//@@.red;$weatherToday.name@@//
 	<</if>>
 
-<span id="nextButton">
 	<<if $nextButton == "END WEEK">> <br><br>
 		<span id="endWeekButton">
 		<strong>
 		<<link [[($nextButton)|($nextLink)]]>><</link>>
 		</strong>
-	</span>
-	@@.cyan;[Ent]@@<br>
-		<<if $rulesError && $rulesAssistantAuto > 0>><br>@@.yellow; WARNING: some custom rules will change slave variables@@<</if>>
+		@@.cyan;[Ent]@@
+		<<if $rulesError && $rulesAssistantAuto == 1>><br>@@.yellow; WARNING: some custom rules will change slave variables@@<</if>>
+		</span>
 	<<elseif $nextButton !== " ">> <br><br>
-			<strong>
-		<<link "$nextButton">> /* must use link so spacebar shortcut will work */
-					<<set $ui = "main">>
-					<<goto $nextLink>>
-			<</link>>
+		<span id="nextButton">
+		<strong>
+		<<link [[$nextButton|$nextLink][$ui = "main"]]>><</link>>
 		</strong>
-			@@.cyan;[Space]@@<br>
+		@@.cyan;[Space]@@
+		</span>
 	<</if>>
-</span>
 
 
 	<<if $sideBarOptions.Cash > 0>> <br>