From 8cbb71eba683a3603a07f5b074a71697eb1eb146 Mon Sep 17 00:00:00 2001
From: Mark Aherne <faerdan@gmail.com>
Date: Fri, 11 Jul 2014 23:28:07 +0100
Subject: [PATCH] Continued work in progress on a major revision of the NanoUI
 templating system.

---
 code/modules/nano/nanoui.dm                   | 10 +++---
 nano/templates/pda.tmpl                       |  2 +-
 nano/templates/shuttle_control_console.tmpl   |  6 ++--
 .../shuttle_control_console_exploration.tmpl  | 35 +++++++++----------
 nano/templates/simple_airlock_console.tmpl    | 12 +++----
 nano/templates/simple_docking_console.tmpl    | 20 +++++------
 .../templates/simple_docking_console_pod.tmpl | 20 +++++------
 nano/templates/smes.tmpl                      | 22 ++++++------
 nano/templates/tanks.tmpl                     | 18 +++++-----
 nano/templates/telescience_console.tmpl       | 10 +++---
 nano/templates/transfer_valve.tmpl            |  8 ++---
 nano/templates/uplink.tmpl                    | 31 ++++++++--------
 12 files changed, 97 insertions(+), 97 deletions(-)

diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm
index c0d00af60af..1ac2be5a686 100644
--- a/code/modules/nano/nanoui.dm
+++ b/code/modules/nano/nanoui.dm
@@ -348,10 +348,12 @@ nanoui is used to open and update nano browser uis
 				<noscript><div id='uiNoJavaScript'>Your browser does not have JavaScript enabled. Please enable JavaScript, then restart SS13.</div></noscript>
 =======
 				<div id='uiLoadingNotice'>Initiating...</div>
-				<noscript id='uiNoScript'>
-					<h2>JAVASCRIPT REQUIRED</h2>
-					<p>Your Internet Explorer's Javascript is disabled (or broken).<br/>
-					Enable Javascript and then open this UI again.</p>
+				<noscript>
+					<div id='uiNoScript'>
+						<h2>JAVASCRIPT REQUIRED</h2>
+						<p>Your Internet Explorer's Javascript is disabled (or broken).<br/>
+						Enable Javascript and then open this UI again.</p>
+					</div>
 				</noscript>
 >>>>>>> 7e7e6cd... Continued work in progress on a major revision of the NanoUI templating system.
 	"}
diff --git a/nano/templates/pda.tmpl b/nano/templates/pda.tmpl
index 6cf52f87492..7b47bb09103 100644
--- a/nano/templates/pda.tmpl
+++ b/nano/templates/pda.tmpl
@@ -26,7 +26,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
 	</div>
 	<br>
 
-        
+
 	{{if data.mode == 0}} <!-- Main Menu -->
         <div class="item">
             <div class="itemLabelNarrow">
diff --git a/nano/templates/shuttle_control_console.tmpl b/nano/templates/shuttle_control_console.tmpl
index a1b30c0eb9e..71ee78f056d 100644
--- a/nano/templates/shuttle_control_console.tmpl
+++ b/nano/templates/shuttle_control_console.tmpl
@@ -58,9 +58,9 @@
 <div class="item" style="padding-top: 10px">
 	<div class="item">
 		<div class="itemContent" style="padding-top: 2px; width: 100%">
-			{{:helper.link('Launch Shuttle', 'arrowthickstop-1-e', {'move' : '1'}, can_launch? null : 'disabled' , null)}}
-			{{:helper.link('Cancel Launch', 'cancel', {'cancel' : '1'}, can_cancel? null : 'disabled' , null)}}
-			{{:helper.link('Force Launch', 'alert', {'force' : '1'}, can_force? null : 'disabled' , can_force? 'redBackground' : null)}}
+			{{:helper.link('Launch Shuttle', 'arrowthickstop-1-e', {'move' : '1'}, data.can_launch? null : 'disabled' , null)}}
+			{{:helper.link('Cancel Launch', 'cancel', {'cancel' : '1'}, data.can_cancel ? null : 'disabled' , null)}}
+			{{:helper.link('Force Launch', 'alert', {'force' : '1'}, data.can_force? null : 'disabled' , can_force? 'redBackground' : null)}}
 		</div>
 	</div>
 </div>
\ No newline at end of file
diff --git a/nano/templates/shuttle_control_console_exploration.tmpl b/nano/templates/shuttle_control_console_exploration.tmpl
index 443b3190a92..507a2b4bda7 100644
--- a/nano/templates/shuttle_control_console_exploration.tmpl
+++ b/nano/templates/shuttle_control_console_exploration.tmpl
@@ -1,7 +1,7 @@
 <h3>Shuttle Status</h3>
 <div class="item" style="padding-top: 10px">
 	<div class="item">
-		{{:shuttle_status}}
+		{{:data.shuttle_status}}
 	</div>
 </div>
 <div class="item" style="padding-top: 10px">
@@ -10,11 +10,11 @@
 			Drive:
 		</div>
 		<div class="itemContent">
-			{{if shuttle_state == "idle"}}
+			{{if data.shuttle_state == "idle"}}
 				<span class="idle">IDLE</span>
-			{{else shuttle_state == "warmup"}}
+			{{else data.shuttle_state == "warmup"}}
 				<span style="font-weight: bold;color: #336699">SPINNING UP</span>
-			{{else shuttle_state == "in_transit"}}
+			{{else data.shuttle_state == "in_transit"}}
 				<span style="font-weight: bold;color: #336699">ENGAGED</span>
 			{{else}}
 				<span class="bad">ERROR</span>
@@ -22,53 +22,52 @@
 		</div>
 	</div>
 </div>
-{{if has_docking}}
+{{if data.has_docking}}
 	<div class="item" style="padding-top: 10px">
 		<div class="item">
 			<div class="itemLabel">
 				Docking Status:
 			</div>
 			<div class="itemContent">
-				{{if docking_status == "docked"}}
+				{{if data.docking_status == "docked"}}
 					<span class="good">DOCKED</span>
-				{{else docking_status == "docking"}}
-					{{if !docking_override}}
+				{{else data.docking_status == "docking"}}
+					{{if !data.docking_override}}
 						<span class="average">DOCKING</span>
 					{{else}}
 						<span class="average">DOCKING-MANUAL</span>
 					{{/if}}
-				{{else docking_status == "undocking"}}
-					{{if !docking_override}}
+				{{else data.docking_status == "undocking"}}
+					{{if !data.docking_override}}
 						<span class="average">UNDOCKING</span>
 					{{else}}
 						<span class="average">UNDOCKING-MANUAL</span>
 					{{/if}}
-				{{else docking_status == "undocked"}}
+				{{else data.docking_status == "undocked"}}
 					<span class="idle">UNDOCKED</span>
 				{{else}}
 					<span class="bad">ERROR</span>
 				{{/if}}
-
 			</div>
 		</div>
 	</div>
 {{/if}}
 <div class="item" style="padding-top: 10px">
 	<div class="itemLabel">
-	Current Destination:
+	    Current Destination:
 	</div>
-	<span class="average">{{:destination_name}}</span>
+	<span class="average">{{:data.destination_name}}</span>
 	<div class="item">
-		{{:~link('Choose Destination', 'arrowreturn-1-s', {'pick' : '1'}, can_pick? null : 'disabled' , null)}}
+		{{:data.~link('Choose Destination', 'arrowreturn-1-s', {'pick' : '1'}, data.can_pick ? null : 'disabled' , null)}}
 	</div>
 </div>
 <h3>Shuttle Control</h3>
 <div class="item" style="padding-top: 10px">
 	<div class="item">
 		<div class="itemContent" style="padding-top: 2px; width: 100%">
-			{{:~link('Launch Shuttle', 'arrowthickstop-1-e', {'move' : '1'}, can_launch? null : 'disabled' , null)}}
-			{{:~link('Cancel Launch', 'cancel', {'cancel' : '1'}, can_cancel? null : 'disabled' , null)}}
-			{{:~link('Force Launch', 'alert', {'force' : '1'}, can_force? null : 'disabled' , can_force? 'redBackground' : null)}}
+			{{:data.~link('Launch Shuttle', 'arrowthickstop-1-e', {'move' : '1'}, data.can_launch ? null : 'disabled' , null)}}
+			{{:data.~link('Cancel Launch', 'cancel', {'cancel' : '1'}, data.can_cancel ? null : 'disabled' , null)}}
+			{{:data.~link('Force Launch', 'alert', {'force' : '1'}, data.can_force ? null : 'disabled' , can_force? 'redBackground' : null)}}
 		</div>
 	</div>
 </div>
\ No newline at end of file
diff --git a/nano/templates/simple_airlock_console.tmpl b/nano/templates/simple_airlock_console.tmpl
index 177e37b3f18..45e256574c4 100644
--- a/nano/templates/simple_airlock_console.tmpl
+++ b/nano/templates/simple_airlock_console.tmpl
@@ -4,7 +4,7 @@
 			Chamber Pressure:
 		</div>
 		<div class="itemContent">
-			{{:helper.displayBar(chamber_pressure, 0, 200, chamber_pressure < 80 || chamber_pressure > 120 ? 'bad' : chamber_pressure < 95 || chamber_pressure > 110 ? 'average' : 'good')}}
+			{{:helper.displayBar(chamber_pressure, 0, 200, (chamber_pressure < 80) || (chamber_pressure > 120) ? 'bad' : (chamber_pressure < 95) || (chamber_pressure > 110) ? 'average' : 'good')}}
 			<div class="statusValue">
 				{{:data.chamber_pressure}} kPa
 			</div>
@@ -14,23 +14,23 @@
 <div class="item" style="padding-top: 10px">
 	<div class="item">
 		<div class="itemContent" style="width: 100%">
-			{{:helper.link('Cycle to Exterior', 'arrowthickstop-1-w', {'command' : 'cycle_ext'}, processing ? 'disabled' : null)}}
-			{{:helper.link('Cycle to Interior', 'arrowthickstop-1-e', {'command' : 'cycle_int'}, processing ? 'disabled' : null)}}
+			{{:helper.link('Cycle to Exterior', 'arrowthickstop-1-w', {'command' : 'cycle_ext'}, data.processing ? 'disabled' : null)}}
+			{{:helper.link('Cycle to Interior', 'arrowthickstop-1-e', {'command' : 'cycle_int'}, data.processing ? 'disabled' : null)}}
 		</div>
 		<div class="itemContent" style="padding-top: 2px; width: 100%">
 		{{if data.interior_status.state == "open"}}
 			{{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, 'redBackground')}}
 		{{else}}
-			{{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, processing ? 'yellowBackground' : null)}}
+			{{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, data.processing ? 'yellowBackground' : null)}}
 		{{/if}}
 		{{if data.exterior_status.state == "open"}}
 			{{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, 'redBackground')}}
 		{{else}}
-			{{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, processing ? 'yellowBackground' : null)}}
+			{{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, data.processing ? 'yellowBackground' : null)}}
 		{{/if}}
 		</div>
 	</div>
 	<div class="item" style="padding-top: 10px; width: 100%">
-			{{:helper.link('Abort', 'cancel', {'command' : 'abort'}, processing ? null : 'disabled', processing ? 'redBackground' : null)}}
+			{{:helper.link('Abort', 'cancel', {'command' : 'abort'}, data.processing ? null : 'disabled', data.processing ? 'redBackground' : null)}}
 	</div>
 </div>
\ No newline at end of file
diff --git a/nano/templates/simple_docking_console.tmpl b/nano/templates/simple_docking_console.tmpl
index feb8cf53e1c..89d76849964 100644
--- a/nano/templates/simple_docking_console.tmpl
+++ b/nano/templates/simple_docking_console.tmpl
@@ -51,9 +51,9 @@
 			{{else data.docking_status == "docking"}}
 				{{if data.door_state == "open"}}
 					<span class="good">OPEN</span>
-				{{else data.door_state == "closed" && door_lock == "locked"}}
+				{{else data.door_state == "closed" && data.door_lock == "locked"}}
 					<span class="good">SECURED</span>
-				{{else data.door_state == "closed" && door_lock == "unlocked"}}
+				{{else data.door_state == "closed" && data.door_lock == "unlocked"}}
 					<span class="good">UNSECURED</span>
 				{{else}}
 					<span class="bad">ERROR</span>
@@ -61,9 +61,9 @@
 			{{else data.docking_status == "undocking"}}
 				{{if data.door_state == "open"}}
 					<span class="average">OPEN</span>
-				{{else data.door_state == "closed" && door_lock == "locked"}}
+				{{else data.door_state == "closed" && data.door_lock == "locked"}}
 					<span class="good">SECURED</span>
-				{{else data.door_state == "closed" && door_lock == "unlocked"}}
+				{{else data.door_state == "closed" && data.door_lock == "unlocked"}}
 					<span class="average">UNSECURED</span>
 				{{else}}
 					<span class="bad">ERROR</span>
@@ -71,9 +71,9 @@
 			{{else data.docking_status == "undocked"}}
 				{{if data.door_state == "open"}}
 					<span class="bad">OPEN</span>
-				{{else data.door_state == "closed" && door_lock == "locked"}}
+				{{else data.door_state == "closed" && data.door_lock == "locked"}}
 					<span class="good">SECURED</span>
-				{{else data.door_state == "closed" && door_lock == "unlocked"}}
+				{{else data.door_state == "closed" && data.door_lock == "unlocked"}}
 					<span class="bad">UNSECURED</span>
 				{{else}}
 					<span class="bad">ERROR</span>
@@ -88,11 +88,11 @@
 	<div class="item">
 		<div class="itemContent" style="padding-top: 2px; width: 100%">
 		{{if data.docking_status == "docked"}}
-			{{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, override_enabled ? null : 'disabled', null)}}
-			{{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, override_enabled ? 'redBackground' : null)}}
+			{{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, data.override_enabled ? null : 'disabled', null)}}
+			{{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redBackground' : null)}}
 		{{else}}
-			{{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, override_enabled ? null : 'disabled', override_enabled? 'redBackground' : null)}}
-			{{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, override_enabled ? 'redBackground' : 'yellowBackground')}}
+			{{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, data.override_enabled ? null : 'disabled', data.override_enabled ? 'redBackground' : null)}}
+			{{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redBackground' : 'yellowBackground')}}
 		{{/if}}
 		</div>
 	</div>
diff --git a/nano/templates/simple_docking_console_pod.tmpl b/nano/templates/simple_docking_console_pod.tmpl
index bca867b56ef..ca8ed973f57 100644
--- a/nano/templates/simple_docking_console_pod.tmpl
+++ b/nano/templates/simple_docking_console_pod.tmpl
@@ -51,9 +51,9 @@
 			{{else data.docking_status == "docking"}}
 				{{if data.door_state == "open"}}
 					<span class="good">OPEN</span>
-				{{else data.door_state == "closed" && door_lock == "locked"}}
+				{{else data.door_state == "closed" && data.door_lock == "locked"}}
 					<span class="good">SECURED</span>
-				{{else data.door_state == "closed" && door_lock == "unlocked"}}
+				{{else data.door_state == "closed" && data.door_lock == "unlocked"}}
 					<span class="good">UNSECURED</span>
 				{{else}}
 					<span class="bad">ERROR</span>
@@ -61,9 +61,9 @@
 			{{else data.docking_status == "undocking"}}
 				{{if data.door_state == "open"}}
 					<span class="average">OPEN</span>
-				{{else data.door_state == "closed" && door_lock == "locked"}}
+				{{else data.door_state == "closed" && data.door_lock == "locked"}}
 					<span class="good">SECURED</span>
-				{{else data.door_state == "closed" && door_lock == "unlocked"}}
+				{{else data.door_state == "closed" && data.door_lock == "unlocked"}}
 					<span class="average">UNSECURED</span>
 				{{else}}
 					<span class="bad">ERROR</span>
@@ -71,9 +71,9 @@
 			{{else data.docking_status == "undocked"}}
 				{{if data.door_state == "open"}}
 					<span class="bad">OPEN</span>
-				{{else data.door_state == "closed" && door_lock == "locked"}}
+				{{else data.door_state == "closed" && data.door_lock == "locked"}}
 					<span class="good">SECURED</span>
-				{{else data.door_state == "closed" && door_lock == "unlocked"}}
+				{{else data.door_state == "closed" && data.door_lock == "unlocked"}}
 					<span class="bad">UNSECURED</span>
 				{{else}}
 					<span class="bad">ERROR</span>
@@ -88,12 +88,12 @@
 	<div class="item">
 		<div class="itemContent" style="padding-top: 2px; width: 100%">
 		{{if data.docking_status == "docked"}}
-			{{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, override_enabled ? null : 'disabled', null)}}
-			{{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, override_enabled ? 'redBackground' : null)}}
+			{{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, data.override_enabled ? null : 'disabled', null)}}
+			{{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redBackground' : null)}}
 			{{:helper.link('MANUAL EJECT', 'alert', {'command' : 'toggle_override'}, 'disabled', null)}}
 		{{else}}
-			{{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, override_enabled ? null : 'disabled', override_enabled? 'redBackground' : null)}}
-			{{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, override_enabled ? 'redBackground' : 'yellowBackground')}}
+			{{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, data.override_enabled ? null : 'disabled', data.override_enabled ? 'redBackground' : null)}}
+			{{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redBackground' : 'yellowBackground')}}
 			{{:helper.link('MANUAL EJECT', 'alert', {'command' : 'toggle_override'}, can_force ? null : 'disabled', can_force ? 'redBackground' : null)}}
 		{{/if}}
 		</div>
diff --git a/nano/templates/smes.tmpl b/nano/templates/smes.tmpl
index e2bf4c92f01..04b93b41480 100644
--- a/nano/templates/smes.tmpl
+++ b/nano/templates/smes.tmpl
@@ -3,9 +3,9 @@
 		Stored Capacity:
 	</div>
 	<div class="itemContent">
-		{{:helper.displayBar(storedCapacity, 0, 100, charging ? 'good' : 'average')}}
+		{{:helper.displayBar(data.storedCapacity, 0, 100, data.charging ? 'good' : 'average')}}
 		<div class="statusValue">
-			{{:helper.round(storedCapacity)}}%
+			{{:helper.round(data.storedCapacity)}}%
 		</div>
 	</div>
 </div>
@@ -16,7 +16,7 @@
 		Charge Mode:
 	</div>
 	<div class="itemContent">
-		{{:helper.link('Auto', 'refresh', {'cmode' : 1}, chargeMode ? 'selected' : null)}}{{:helper.link('Off', 'close', {'cmode' : 1}, chargeMode ? null : 'selected')}}
+		{{:helper.link('Auto', 'refresh', {'cmode' : 1}, data.chargeMode ? 'selected' : null)}}{{:helper.link('Off', 'close', {'cmode' : 1}, data.chargeMode ? null : 'selected')}}
 		&nbsp;
 		{{if data.charging}}
 			[<span class='good'>Charging</span>]
@@ -31,11 +31,11 @@
 		Input Level:
 	</div>
 	<div class="itemContent">
-		{{:helper.displayBar(chargeLevel, 0, chargeMax)}}			
+		{{:helper.displayBar(data.chargeLevel, 0, data.chargeMax)}}
 		<div style="clear: both; padding-top: 4px;">
-			{{:helper.link('MIN', null, {'input' : 'min'}, (chargeLevel > 0) ? null : 'disabled')}}
+			{{:helper.link('MIN', null, {'input' : 'min'}, (data.chargeLevel > 0) ? null : 'disabled')}}
 			{{:helper.link('SET', null, {'input' : 'set'}, null)}}			
-			{{:helper.link('MAX', null, {'input' : 'max'}, (chargeLevel < chargeMax) ? null : 'disabled')}}
+			{{:helper.link('MAX', null, {'input' : 'max'}, (data.chargeLevel < data.chargeMax) ? null : 'disabled')}}
 			<div style="float: left; width: 80px; text-align: center;">&nbsp;{{:data.chargeLevel}} W&nbsp;</div>
 		</div>
 	</div>
@@ -47,7 +47,7 @@
 		Output Status:
 	</div>
 	<div class="itemContent">
-		{{:helper.link('Online', 'power', {'online' : 1}, outputOnline ? 'selected' : null)}}{{:helper.link('Offline', 'close', {'online' : 1}, outputOnline ? null : 'selected')}}
+		{{:helper.link('Online', 'power', {'online' : 1}, data.outputOnline ? 'selected' : null)}}{{:helper.link('Offline', 'close', {'online' : 1}, data.outputOnline ? null : 'selected')}}
 	</div>
 </div>
 
@@ -56,11 +56,11 @@
 		Output Level:
 	</div>
 	<div class="itemContent">
-		{{:helper.displayBar(outputLevel, 0, outputMax)}}			
+		{{:helper.displayBar(data.outputLevel, 0, data.outputMax)}}
 		<div style="clear: both; padding-top: 4px;">
-			{{:helper.link('MIN', null, {'output' : 'min'}, (outputLevel > 0) ? null : 'disabled')}}
+			{{:helper.link('MIN', null, {'output' : 'min'}, (data.outputLevel > 0) ? null : 'disabled')}}
 			{{:helper.link('SET', null, {'output' : 'set'}, null)}}			
-			{{:helper.link('MAX', null, {'output' : 'max'}, (outputLevel < outputMax) ? null : 'disabled')}}
+			{{:helper.link('MAX', null, {'output' : 'max'}, (data.outputLevel < data.outputMax) ? null : 'disabled')}}
 			<div style="float: left; width: 80px; text-align: center;">&nbsp;{{:data.outputLevel}} W&nbsp;</div>			
 		</div>
 	</div>
@@ -71,7 +71,7 @@
 		Output Load:
 	</div>
 	<div class="itemContent">
-		{{:helper.displayBar(outputLoad, 0, outputMax, (outputLoad < outputLevel) ? 'good' : 'average')}}
+		{{:helper.displayBar(data.outputLoad, 0, data.outputMax, (data.outputLoad < data.outputLevel) ? 'good' : 'average')}}
 		<div class="statusValue">
 			{{:data.outputLoad}} W
 		</div>
diff --git a/nano/templates/tanks.tmpl b/nano/templates/tanks.tmpl
index ab64597b211..a1929dbe4ef 100644
--- a/nano/templates/tanks.tmpl
+++ b/nano/templates/tanks.tmpl
@@ -9,7 +9,7 @@
 		Tank Pressure:
 	</div>
 	<div class="itemContent">
-		{{:helper.displayBar(tankPressure, 0, 1013, (tankPressure > 200) ? 'good' : (tankPressure > 100) ? 'average' : 'bad'))}}
+		{{:helper.displayBar(data.tankPressure, 0, 1013, (data.tankPressure > 200) ? 'good' : (data.tankPressure > 100) ? 'average' : 'bad'))}}
 		<div class="statusValue">
 			{{:data.tankPressure}} kPa
 		</div>
@@ -23,15 +23,15 @@
 		Mask Release Pressure:
 	</div>
 	<div class="itemContent">
-		{{:helper.displayBar(releasePressure, 0, maxReleasePressure, (releasePressure >= 23) ? null : ((releasePressure >= 17) ? 'average' : 'bad'))}}			
+		{{:helper.displayBar(data.releasePressure, 0, data.maxReleasePressure, (data.releasePressure >= 23) ? null : ((data.releasePressure >= 17) ? 'average' : 'bad'))}}			
 		<div style="clear: both; padding-top: 4px;">
-			{{:helper.link('-', null, {'dist_p' : -10}, (releasePressure > 0) ? null : 'disabled')}}
-			{{:helper.link('-', null, {'dist_p' : -1}, (releasePressure > 0) ? null : 'disabled')}}				
+			{{:helper.link('-', null, {'dist_p' : -10}, (data.releasePressure > 0) ? null : 'disabled')}}
+			{{:helper.link('-', null, {'dist_p' : -1}, (data.releasePressure > 0) ? null : 'disabled')}}				
 			<div style="float: left; width: 80px; text-align: center;">&nbsp;{{:data.releasePressure}} kPa&nbsp;</div>
-			{{:helper.link('+', null, {'dist_p' : 1}, (releasePressure < maxReleasePressure) ? null : 'disabled')}}
-			{{:helper.link('+', null, {'dist_p' : 10}, (releasePressure < maxReleasePressure) ? null : 'disabled')}}		
-			{{:helper.link('Max', null, {'dist_p' : 'max'}, (releasePressure < maxReleasePressure) ? null : 'disabled')}}
-			{{:helper.link('Reset', null, {'dist_p' : 'reset'}, (releasePressure != defaultReleasePressure) ? null : 'disabled')}}
+			{{:helper.link('+', null, {'dist_p' : 1}, (data.releasePressure < data.maxReleasePressure) ? null : 'disabled')}}
+			{{:helper.link('+', null, {'dist_p' : 10}, (data.releasePressure < data.maxReleasePressure) ? null : 'disabled')}}		
+			{{:helper.link('Max', null, {'dist_p' : 'max'}, (data.releasePressure < data.maxReleasePressure) ? null : 'disabled')}}
+			{{:helper.link('Reset', null, {'dist_p' : 'reset'}, (data.releasePressure != data.defaultReleasePressure) ? null : 'disabled')}}
 		</div>
 	</div>
 </div>
@@ -41,7 +41,7 @@
 		Mask Release Valve:
 	</div>
 	<div class="itemContent">
-		{{:helper.link('Open', 'unlocked', {'stat' : 1}, (!maskConnected) ? 'disabled' : (valveOpen ? 'selected' : null))}}{{:helper.link('Close', 'locked', {'stat' : 1}, valveOpen ? null : 'selected')}}
+		{{:helper.link('Open', 'unlocked', {'stat' : 1}, (!data.maskConnected) ? 'disabled' : (data.valveOpen ? 'selected' : null))}}{{:helper.link('Close', 'locked', {'stat' : 1}, data.valveOpen ? null : 'selected')}}
 	</div>
 </div>
 
diff --git a/nano/templates/telescience_console.tmpl b/nano/templates/telescience_console.tmpl
index 5906a4e38e6..4f88267510c 100644
--- a/nano/templates/telescience_console.tmpl
+++ b/nano/templates/telescience_console.tmpl
@@ -5,16 +5,16 @@ Used In File(s): \code\modules\telesci\telesci_computer.dm
 <div class="item">
 	<div class="itemLabel">Coordinates:</div>
 	<div class="itemContent">
-		{{:helper.link('X: ' + coordx, 'gear', {'setx': 1})}}
-		{{:helper.link('Y: ' + coordy, 'gear', {'sety': 1})}}
-		{{:helper.link('Z: ' + coordz, 'gear', {'setz': 1})}}
+		{{:helper.link('X: ' + data.coordx, 'gear', {'setx': 1})}}
+		{{:helper.link('Y: ' + data.coordy, 'gear', {'sety': 1})}}
+		{{:helper.link('Z: ' + data.coordz, 'gear', {'setz': 1})}}
 	</div>
 </div>
 <div class="item">
 	<div class="itemLabel">Controls:</div>
 	<div class="itemContent">
-		{{:helper.link('Send', 'gear', {'send': 1}, null, (coordx != null && coordy != null && coordz != null) ? '' : 'disabled')}}
-		{{:helper.link('Receive', 'gear', {'receive': 1}, null, (coordx != null && coordy != null && coordz != null) ? '' : 'disabled')}}
+		{{:helper.link('Send', 'gear', {'send': 1}, null, (data.coordx != null && data.coordy != null && data.coordz != null) ? '' : 'disabled')}}
+		{{:helper.link('Receive', 'gear', {'receive': 1}, null, (data.coordx != null && data.coordy != null && data.coordz != null) ? '' : 'disabled')}}
 		{{:helper.link('Recalibrate', 'gear', {'recal': 1})}}
 	</div>
 </div>
diff --git a/nano/templates/transfer_valve.tmpl b/nano/templates/transfer_valve.tmpl
index 470a097469f..f8395839994 100644
--- a/nano/templates/transfer_valve.tmpl
+++ b/nano/templates/transfer_valve.tmpl
@@ -8,7 +8,7 @@
 		{{else}}
 			<i>None</i>
 		{{/if}}
-		{{:helper.link('Remove', 'eject', {'tankone' : 1}, attachmentOne ? null : 'disabled')}}
+		{{:helper.link('Remove', 'eject', {'tankone' : 1}, data.attachmentOne ? null : 'disabled')}}
 	</div>
 </div>
 
@@ -22,7 +22,7 @@
 		{{else}}
 			<i>None</i>
 		{{/if}}
-		{{:helper.link('Remove', 'eject', {'tanktwo' : 1}, attachmentTwo ? null : 'disabled')}}
+		{{:helper.link('Remove', 'eject', {'tanktwo' : 1}, data.attachmentTwo ? null : 'disabled')}}
 	</div>
 </div>
 
@@ -36,7 +36,7 @@
 		{{else}}
 			<i>None</i>
 		{{/if}}		
-		{{:helper.link('Remove', 'eject', {'rem_device' : 1}, valveAttachment ? null : 'disabled')}}
+		{{:helper.link('Remove', 'eject', {'rem_device' : 1}, data.valveAttachment ? null : 'disabled')}}
 		{{if data.valveAttachment}}
 			{{:helper.link('View', 'wrench', {'device' : 1})}}
 		{{/if}}		
@@ -50,7 +50,7 @@
 		Valve Status:
 	</div>
 	<div class="itemContent">
-		{{:helper.link('Open', 'unlocked', {'open' : 1}, (!attachmentOne || !attachmentTwo) ? 'disabled' : (valveOpen ? 'selected' : null))}}{{:helper.link('Close', 'locked', {'open' : 1}, (!attachmentOne || !attachmentTwo) ? 'disabled' : (valveOpen ? null : 'selected'))}}
+		{{:helper.link('Open', 'unlocked', {'open' : 1}, (!data.attachmentOne || !data.attachmentTwo) ? 'disabled' : (data.valveOpen ? 'selected' : null))}}{{:helper.link('Close', 'locked', {'open' : 1}, (!data.attachmentOne || !data.attachmentTwo) ? 'disabled' : (data.valveOpen ? null : 'selected'))}}
 	</div>
 </div>
 
diff --git a/nano/templates/uplink.tmpl b/nano/templates/uplink.tmpl
index d11160772ea..dd92bcd0bea 100644
--- a/nano/templates/uplink.tmpl
+++ b/nano/templates/uplink.tmpl
@@ -16,31 +16,30 @@ Used In File(s): \code\game\objects\items\devices\uplinks.dm
 </div>
 <br>
 <div class="item">
-        <div class="itemLabel">
-                <b>Tele-Crystals</b>:
-        </div>
-        <div class="itemContent">
-                {{:data.crystals}}
-        </div>
+    <div class="itemLabel">
+        <b>Tele-Crystals</b>:
+    </div>
+    <div class="itemContent">
+        {{:data.crystals}}
+    </div>
 </div>
 <H2><span class="white">Request items:</span></H2><br>
 <span class="white"><i>Each item costs a number of tele-crystals as indicated by the number following their name.</i></span>
 
 <br><br>
 {{for data.nano_items}}
-<div class="item">
-	<H3><span class="white">{{:data.Category}}</span></H3>
-</div>
-	{{for data.items}}
-<div class="item">
-		{{:helper.link( Name, 'gear', {'buy_item' : obj_path, 'cost' : Cost}, Cost > ~root.crystals ? 'disabled' : null, null)}} -<span class="white"> {{:data.Cost}}</span>
-</div>
+    <div class="item">
+	    <H3><span class="white">{{:value.Category}}</span></H3>
+    </div>
+	{{for data.items :itemValue:itemIndex}}
+        <div class="item">
+            {{:helper.link( itemValue.Name, 'gear', {'buy_item' : itemValue.obj_path, 'cost' : itemValue.Cost}, itemValue.Cost > data.crystals ? 'disabled' : null, null)}} - <span class="white">{{:itemValue.Cost}}</span>
+        </div>
 	{{/for}}
-<br>
-
+    <br>
 {{/for}}
 
 <div class="item">
-                {{:helper.link('Buy Random (??)' , 'gear', {'buy_item' : 'random'}, null, 'fixedLeftWidest')}}
+    {{:helper.link('Buy Random (??)' , 'gear', {'buy_item' : 'random'}, null, 'fixedLeftWidest')}}
 </div>