From e887c855c12c505c7a4cd25bd2b202200604ca9e Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Thu, 17 Jul 2014 18:59:42 -0400 Subject: [PATCH] Fixed the fucking NanoUI finally --- nano/templates/air_alarm.tmpl | 14 +++--- nano/templates/atmos_control.tmpl | 17 +++---- nano/templates/comm_console.tmpl | 74 +++++++++++++++---------------- 3 files changed, 53 insertions(+), 52 deletions(-) diff --git a/nano/templates/air_alarm.tmpl b/nano/templates/air_alarm.tmpl index a97a032d101..4f4b425cbb0 100644 --- a/nano/templates/air_alarm.tmpl +++ b/nano/templates/air_alarm.tmpl @@ -2,7 +2,7 @@ Title: Air Alarm UI Used In File(s): /code/game/machinery/alarm.dm --> -{{!-- +

{{:data.name}}

{{if !data.air}}
Unable to acquire air sample.
@@ -121,7 +121,7 @@ Used In File(s): /code/game/machinery/alarm.dm {{:helper.link('Thresholds','gear',{'screen':5},(data.screen==5)?'linkOn':'')}} - {{!-- VENTS --}} + {{if data.screen == 2}}

Vent Pump Settings

{{for data.vents}} @@ -159,7 +159,7 @@ Used In File(s): /code/game/machinery/alarm.dm {{empty}} No vent pumps located in this area. {{/for}} - {{!-- SCRUBBERS --}} + {{else data.screen == 3}}

Scrubbers

{{for data.scrubbers}} @@ -195,10 +195,10 @@ Used In File(s): /code/game/machinery/alarm.dm {{/if}} - {{else}} + {{empty}} No scrubbers located in this area. {{/for}} - {{!-- MODES --}} + {{else data.screen == 4}}

System Mode

@@ -223,7 +223,7 @@ Used In File(s): /code/game/machinery/alarm.dm
{{/for}} - {{!-- SENSORS --}} + {{else data.screen == 5}}

Sensor Thresholds

diff --git a/nano/templates/atmos_control.tmpl b/nano/templates/atmos_control.tmpl index bff831d4892..47651211132 100644 --- a/nano/templates/atmos_control.tmpl +++ b/nano/templates/atmos_control.tmpl @@ -2,7 +2,7 @@ Title: Atmos Control UI Used In File(s): /code/game/machinery/alarm.dm --> -{{!-- + {{if !data.alarm}}

Atmospherics Control

@@ -135,7 +135,7 @@ Used In File(s): /code/game/machinery/alarm.dm {{:helper.link('Thresholds','gear',{'screen':5},(data.screen==5)?'linkOn':'')}}
- {{!-- VENTS --}} + {{if data.screen == 2}}

Vent Pump Settings

{{for data.vents}} @@ -173,7 +173,7 @@ Used In File(s): /code/game/machinery/alarm.dm {{empty}} No vent pumps located in this area. {{/for}} - {{!-- SCRUBBERS --}} + {{else data.screen == 3}}

Scrubbers

{{for data.scrubbers}} @@ -209,10 +209,10 @@ Used In File(s): /code/game/machinery/alarm.dm {{/if}} - {{else}} + {{empty}} No scrubbers located in this area. {{/for}} - {{!-- MODES --}} + {{else data.screen == 4}}

System Mode

@@ -237,7 +237,7 @@ Used In File(s): /code/game/machinery/alarm.dm
{{/for}} - {{!-- SENSORS --}} + {{else data.screen == 5}}

Sensor Thresholds

@@ -290,4 +290,5 @@ Used In File(s): /code/game/machinery/alarm.dm
{{/if}} - {{/if}} \ No newline at end of file + {{/if}} +{{/if}} \ No newline at end of file diff --git a/nano/templates/comm_console.tmpl b/nano/templates/comm_console.tmpl index 382769e32f9..1d830f5b7e9 100644 --- a/nano/templates/comm_console.tmpl +++ b/nano/templates/comm_console.tmpl @@ -2,49 +2,49 @@ Title: Communications Used In File(s): /code/game/machinery/computers/communications.dm --> -{{!-- + +{{if !data.authenticated}}
Please swipe your ID card. {{:helper.link('Log In','unlocked',{'operation':'login'},null,'fixed')}}
{{else}} - {{if !is_ai}} + {{if !data.is_ai}}
Please remember to {{:helper.link('Log Out','locked',{'operation':'logout'},null,'fixed')}}
{{/if}}

Emergency Shuttle:

- {{if shuttle.eta}} + {{if data.shuttle.eta}}
ETA:
- {{>shuttle.eta}} + {{>data.shuttle.eta}}
- {{/if}}{{!-- SHUTTLE ETA --}} + {{/if}}
Options:
- {{if shuttle.pos == 0}} - {{if shuttle.on && !is_ai}} + {{if data.shuttle.pos == 0}} + {{if data.shuttle.on && !data.is_ai}} {{:helper.link('Cancel Shuttle','arrowreturnthick-1-w',{'operation':'cancelshuttle'})}} - {{else !shuttle.on}} + {{else !data.shuttle.on}} {{:helper.link('Call Shuttle','arrowthickstop-1-s',{'operation':'callshuttle'})}} {{/if}} {{/if}}
- {{if screen==1}} - {{!-- MAIN SCREEN --}} + {{if data.screen==1}} +

Menu

- {{if authenticated==2}} + {{if data.authenticated==2}}
{{:helper.link('Make an Announcement','alert',{'operation':'announce'})}}
- {{if emagged}} + {{if data.emagged}} {{:helper.link('Message [UNKNOWN]','mail-closed',{'operation':'MessageSyndicate'})}}
@@ -64,39 +64,39 @@ Used In File(s): /code/game/machinery/computers/communications.dm {{:helper.link('Message List','comment',{'operation':'messagelist'})}}
- {{else screen==2}} - {{!-- STATUS DISPLAYS --}} + {{else data.screen==2}} +

Status Displays

{{:helper.link('Back','home',{'operation':'main'})}}

Presets

- {{for stat_display.presets}} + {{for data.stat_display.presets}}
-
{{:helper.link(label,'info',{'operation':'setstat','statdisp':name},null,(name==data.stat_display.type?'linkOn':''))}}
+
{{:helper.link(data.label,'info',{'operation':'setstat','statdisp':name},null,(name==data.stat_display.type?'linkOn':''))}}
{{/for}}

Alerts

- {{for stat_display.alerts}} + {{for data.stat_display.alerts}}
-
{{:helper.link(label,'alert',{'operation':'setstat','statdisp':'alert','alert':alert},null,(name==data.stat_display.type?'linkOn':''))}}
+
{{:helper.link(data.label,'alert',{'operation':'setstat','statdisp':'alert','alert':alert},null,(name==data.stat_display.type?'linkOn':''))}}
{{/for}}

Messages

- {{if stat_display.type}} + {{if data.stat_display.type}}
{{:helper.link('Line 1:','gear',{'operation':'setmsg1'})}}
-
{{>stat_display.line_1}}
+
{{>data.stat_display.line_1}}
{{:helper.link('Line 2:','gear',{'operation':'setmsg2'})}}
-
{{>stat_display.line_2}}
+
{{>data.stat_display.line_2}}
{{/if}}
- {{else screen==3}} - {{!-- MESSAGES --}} + {{else data.screen==3}} +

Messages

- {{if current_message}} + {{if data.current_message}} {{:helper.link('Messages','home',{'operation':'messagelist'})}}

{{>title}}

@@ -104,31 +104,31 @@ Used In File(s): /code/game/machinery/computers/communications.dm
{{else}} {{:helper.link('Back','home',{'operation':'main'})}} - {{for messages}} + {{for data.messages}}
- {{:helper.link('Open','mail-open',{'operation':'messagelist','msgid':id})}} - {{:helper.link('Delete','close',{'operation':'delmessage','msgid':id},'red')}} - {{>title}} + {{:helper.link('Open','mail-open',{'operation':'messagelist','msgid':data.id})}} + {{:helper.link('Delete','close',{'operation':'delmessage','msgid':data.id},'red')}} + {{>data.title}}
{{/for}} {{/if}} - {{else screen==4}} - {{!-- ALERT LEVEL --}} + {{else data.screen==4}} +

Security Level

{{:helper.link('Back','home',{'operation':'main'})}}
Security Level:
-
{{>str_security_level}}
+
{{>data.str_security_level}}
Presets:
- {{for levels}} - {{:helper.link(name,'comment',{'operation':'newalertlevel','level':id},null,(id==data.security_level?'linkOn':''))}} + {{for data.levels}} + {{:helper.link(name,'comment',{'operation':'newalertlevel','level':data.id},null,(data.id==data.security_level?'linkOn':''))}} {{/for}}
- {{/if}}{{!-- SCREEN --}} -{{/if}}{{!-- AUTHENTICATED --}} \ No newline at end of file + {{/if}} +{{/if}} \ No newline at end of file