Skip to content
Snippets Groups Projects
Commit 111eaf5e authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'Sidebar-order' into 'pregmod-master'

Sidebar order

See merge request pregmodfan/fc-pregmod!1470
parents 848e1b60 f1380093
No related branches found
No related tags found
No related merge requests found
...@@ -507,14 +507,6 @@ ...@@ -507,14 +507,6 @@
<br><span id="manageArcology"><<link "Manage Arcology">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Arcology">><</link>></span> @@.cyan;[C]@@ <br><span id="manageArcology"><<link "Manage Arcology">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Arcology">><</link>></span> @@.cyan;[C]@@
<br><span id="managePenthouse"><<link "Manage Penthouse">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Penthouse">><</link>></span> @@.cyan;[P]@@ <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="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 $secExp == 1>>
<<if $propHub == 1>> <<if $propHub == 1>>
<br><span id="propHub"><<link "Manage PR">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "propagandaHub">><</link>></span> @@.cyan;[Shift+H]@@ <br><span id="propHub"><<link "Manage PR">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "propagandaHub">><</link>></span> @@.cyan;[Shift+H]@@
...@@ -528,15 +520,25 @@ ...@@ -528,15 +520,25 @@
<<if $riotCenter == 1>> <<if $riotCenter == 1>>
<br><span id="riotCenter"><<link "Manage Rebels">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "riotControlCenter">><</link>></span> @@.cyan;[Shift+R]@@ <br><span id="riotCenter"><<link "Manage Rebels">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "riotControlCenter">><</link>></span> @@.cyan;[Shift+R]@@
<</if>> <</if>>
<br><span id="edictButton"><<link [[Edicts|edicts]]>><</link>></span> @@.cyan;[D]@@
<</if>>
<<if $cyberMod != 0 && $researchLab.built == "true">> <<if $cyberMod != 0 && $researchLab.built == "true">>
<br>[[Manage Research Lab|Research Lab][$temp = 0]] <br>[[Manage Research Lab|Research Lab][$temp = 0]]
<</if>> <</if>>
<<if ($securityForceActive)>> <<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>> <</if>>
<br>
<br><span id="PAOButton"><<link [[Personal Assistant|Personal assistant options]]>><</link>></span> @@.cyan;[T]@@
<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>> <</if>>
<br> <br>
...@@ -544,14 +546,6 @@ ...@@ -544,14 +546,6 @@
<br> <br>
<br><span id="managePenthouse"><<link "Manage Penthouse">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Penthouse">><</link>></span> @@.cyan;[P]@@ <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="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 $secExp == 1>>
<<if $propHub == 1>> <<if $propHub == 1>>
<br><span id="propHub"><<link "Manage PR">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "propagandaHub">><</link>></span> @@.cyan;[Shift+H]@@ <br><span id="propHub"><<link "Manage PR">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "propagandaHub">><</link>></span> @@.cyan;[Shift+H]@@
...@@ -565,15 +559,25 @@ ...@@ -565,15 +559,25 @@
<<if $riotCenter == 1>> <<if $riotCenter == 1>>
<br><span id="riotCenter"><<link "Manage Rebels">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "riotControlCenter">><</link>></span> @@.cyan;[Shift+R]@@ <br><span id="riotCenter"><<link "Manage Rebels">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "riotControlCenter">><</link>></span> @@.cyan;[Shift+R]@@
<</if>> <</if>>
<br><span id="edictButton"><<link [[Edicts|edicts]]>><</link>></span> @@.cyan;[D]@@
<</if>>
<<if $cyberMod != 0 && $researchLab.built == "true">> <<if $cyberMod != 0 && $researchLab.built == "true">>
<br>[[Manage Research Lab|Research Lab][$temp = 0]] <br>[[Manage Research Lab|Research Lab][$temp = 0]]
<</if>> <</if>>
<<if ($securityForceActive)>> <<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="PAOButton"><<link [[Personal Assistant|Personal assistant options]]>><</link>></span> @@.cyan;[T]@@
<br><span id="policyButton"><<link [[Policies]]>><</link>></span> @@.cyan;[Y]@@
<br><span id="edictButton"><<link [[Edicts|edicts]]>><</link>></span> @@.cyan;[D]@@
<</if>> <</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">> <<elseif _Pass == "Manage Penthouse">>
<br> <br>
<br><span id="manageArcology"><<link [[Manage Arcology|Manage Arcology]]>><</link>></span> @@.cyan;[C]@@ <br><span id="manageArcology"><<link [[Manage Arcology|Manage Arcology]]>><</link>></span> @@.cyan;[C]@@
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment