Sorting sidebar links

Another change from vanilla.  Nothing is changed here except the order of the sidebar links.  The important bit is moving game options so it is always at the end of the list and seperated by whitespace.

After that, the goal was to group similar things.  I picked two categories for this in the vanilla commit, "visiting real places" and "setting rules from your desk."  They don't need to be labeled, it's just implied.

So I grouped the very similar policies and edicts, and put them with universal rules.

Then moved the PR, sec, mil, and rebs up in the list to be with the other "places."  Should be more obvious at a glance where things are.

src/uncategorized/storyCaption.tw

@@ -510,13 +510,6 @@
 		<br><span id="managePenthouse"><<link "Manage Penthouse">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Penthouse">><</link>></span> @@.cyan;[P]@@
 		<br><span id="managePerson"><<link "Manage Personal Affairs">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Personal Affairs">><</link>></span> @@.cyan;[X]@@
 		<br><span id="PAOButton"><<link [[Personal Assistant|Personal assistant options]]>><</link>></span> @@.cyan;[T]@@
-		<br><span id="policyButton"><<link [[Policies]]>><</link>></span> @@.cyan;[Y]@@
-		<<if $FSAnnounced>>
-			<br><span id="FSButton"><<link [[Future Societies|Future Society]]>><</link>></span> @@.cyan;[F]@@ <<if $FSCredits > 0>>@@.yellow;[!]@@<</if>>
-		<</if>>
-		<br><span id="URButton"><<link [[Universal Rules]]>><</link>></span> @@.cyan;[V]@@
-		<br><span id="optionsButton"><<link "Game Options">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Options">><</link>></span> @@.cyan;[O]@@
-		
 		<<if $secExp == 1>>
 		<<if $propHub == 1>>
 		<br><span id="propHub"><<link "Manage PR">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "propagandaHub">><</link>></span> @@.cyan;[Shift+H]@@
@@ -530,15 +523,24 @@
 		<<if $riotCenter == 1>>
 		<br><span id="riotCenter"><<link "Manage Rebels">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "riotControlCenter">><</link>></span> @@.cyan;[Shift+R]@@
 		<</if>>
-		<br><span id="edictButton"><<link [[Edicts|edicts]]>><</link>></span> @@.cyan;[D]@@
-		<</if>>
-		
 		<<if $cyberMod != 0 && $researchLab.built == "true">>
 			<br>[[Manage Research Lab|Research Lab][$temp = 0]]
 		<</if>>
 		<<if ($securityForceActive)>>
-				<br><span id="SFMButton"><<link [[SF Barracks|SFM Barracks]]>><</link>></span> @@.cyan;[Z]@@
+			<br><span id="SFMButton"><<link [[SF Barracks|SFM Barracks]]>><</link>></span> @@.cyan;[Z]@@
 		<</if>>
+		
+		<br>
+		<br><span id="policyButton"><<link [[Policies]]>><</link>></span> @@.cyan;[Y]@@
+		<br><span id="edictButton"><<link [[Edicts|edicts]]>><</link>></span> @@.cyan;[D]@@
+		<</if>>
+		<<if $FSAnnounced>>
+			<br><span id="FSButton"><<link [[Future Societies|Future Society]]>><</link>></span> @@.cyan;[F]@@ <<if $FSCredits > 0>>@@.yellow;[!]@@<</if>>
+		<</if>>
+		<br><span id="URButton"><<link [[Universal Rules]]>><</link>></span> @@.cyan;[V]@@
+		
+		<br>
+		<br><span id="optionsButton"><<link "Game Options">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Options">><</link>></span> @@.cyan;[O]@@
 	<</if>>
 	<br>
 			
@@ -547,13 +549,6 @@
 	<br><span id="managePenthouse"><<link "Manage Penthouse">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Penthouse">><</link>></span> @@.cyan;[P]@@
 	<br><span id="managePerson"><<link "Manage Personal Affairs">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Personal Affairs">><</link>></span> @@.cyan;[X]@@
 	<br><span id="PAOButton"><<link [[Personal Assistant|Personal assistant options]]>><</link>></span> @@.cyan;[T]@@
-	<br><span id="policyButton"><<link [[Policies]]>><</link>></span> @@.cyan;[Y]@@
-	<<if $FSAnnounced>>
-	<br><span id="FSButton"><<link [[Future Societies|Future Society]]>><</link>></span> @@.cyan;[F]@@
-	<</if>>
-	<br><span id="URButton"><<link [[Universal Rules]]>><</link>></span> @@.cyan;[V]@@
-	<br><span id="optionsButton"><<link "Game Options">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Options">><</link>></span> @@.cyan;[O]@@
-	
 	<<if $secExp == 1>>
 	<<if $propHub == 1>>
 	<br><span id="propHub"><<link "Manage PR">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "propagandaHub">><</link>></span> @@.cyan;[Shift+H]@@
@@ -567,15 +562,23 @@
 	<<if $riotCenter == 1>>
 	<br><span id="riotCenter"><<link "Manage Rebels">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "riotControlCenter">><</link>></span> @@.cyan;[Shift+R]@@
 	<</if>>
-	<br><span id="edictButton"><<link [[Edicts|edicts]]>><</link>></span> @@.cyan;[D]@@
-	<</if>>
-	
+
 	<<if $cyberMod != 0 && $researchLab.built == "true">>
 	<br>[[Manage Research Lab|Research Lab][$temp = 0]]
 	<</if>>
 	<<if ($securityForceActive)>>
 	<br><span id="SFMButton"><<link [[SF Barracks|SFM Barracks]]>><</link>></span> @@.cyan;[Z]@@
+	<</if>>	
+	<br>
+	<br><span id="policyButton"><<link [[Policies]]>><</link>></span> @@.cyan;[Y]@@
+	<br><span id="edictButton"><<link [[Edicts|edicts]]>><</link>></span> @@.cyan;[D]@@
+	<</if>>
+	<<if $FSAnnounced>>
+	<br><span id="FSButton"><<link [[Future Societies|Future Society]]>><</link>></span> @@.cyan;[F]@@
 	<</if>>
+	<br><span id="URButton"><<link [[Universal Rules]]>><</link>></span> @@.cyan;[V]@@
+	<br>
+	<br><span id="optionsButton"><<link "Game Options">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Options">><</link>></span> @@.cyan;[O]@@
 <<elseif _Pass == "Manage Penthouse">>
 	<br>
 	<br><<link [[Wardrobe]]>><</link>>