cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 01:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Standardized power displays (#2539)

Browse Source 
* Standardized power displays

* Update tgui.js

* Delete tgui.js.rej
This commit is contained in:
CitadelStationBot
2017-09-13 17:57:16 -05:00
committed by Poojawa
parent f6dfc177f5
commit 083fc1a7b4
25 changed files with 75 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tgui/assets/tgui.js
View File

File diff suppressed because one or more lines are too long

4
tgui/src/interfaces/apc.ract
View File

@@ -94,7 +94,7 @@
<ui-display title='Power Channels'>
{{#each data.powerChannels}}
<ui-section label='{{title}}' nowrap>
<div class='content'>{{Math.round(adata.powerChannels[@index].powerLoad)}} W</div>
<div class='content'>{{adata.powerChannels[@index].powerLoad}}</div>
<div class='content'><span class='{{status >= 2 ? "good" : "bad"}}'>{{status >= 2 ? "On" : "Off"}}</span></div>
<div class='content'>[<span>{{status == 1 || status == 3 ? "Auto" : "Manual"}}</span>]</div>
<div class='content' style='float:right'>
@@ -110,7 +110,7 @@
</ui-section>
{{/each}}
<ui-section label='Total Load'>
<span class='bold'>{{Math.round(adata.totalLoad)}} W</span>
<span class='bold'>{{adata.totalLoad}}</span>
</ui-section>
</ui-display>
{{#if data.siliconUser}}

6
tgui/src/interfaces/ntos_power_monitor.ract
View File

@@ -50,10 +50,10 @@
xinc='{{data.stored / 10}}' yinc='9'/>
{{else}}
<ui-section label='Available'>
<span>{{data.supply}} W</span>
<span>{{data.supply}}</span>
</ui-section>
<ui-section label='Load'>
<span>{{data.demand}} W</span>
<span>{{data.demand}}</span>
</ui-section>
{{/if}}
</ui-display>
@@ -70,7 +70,7 @@
{{#each data.areas}}
<ui-section label='{{name}}' nowrap>
<div class='content'>{{Math.round(adata.areas[@index].charge)}} %</div>
<div class='content'>{{Math.round(adata.areas[@index].load)}} W</div>
<div class='content'>{{adata.areas[@index].load}}</div>
<div class='content'><span class='{{chargingState(charging)}}'>{{chargingMode(charging)}}</span></div>
<div class='content'><span class='{{channelState(eqp)}}'>{{channelPower(eqp)}} [<span>{{channelMode(eqp)}}</span>]</span></div>
<div class='content'><span class='{{channelState(lgt)}}'>{{channelPower(lgt)}} [<span>{{channelMode(lgt)}}</span>]</span></div>

6
tgui/src/interfaces/power_monitor.ract
View File

@@ -47,10 +47,10 @@
xinc='{{data.stored / 10}}' yinc='9'/>
{{else}}
<ui-section label='Available'>
<span>{{data.supply}} W</span>
<span>{{data.supply}}</span>
</ui-section>
<ui-section label='Load'>
<span>{{data.demand}} W</span>
<span>{{data.demand}}</span>
</ui-section>
{{/if}}
</ui-display>
@@ -67,7 +67,7 @@
{{#each data.areas}}
<ui-section label='{{name}}' nowrap>
<div class='content'>{{Math.round(adata.areas[@index].charge)}} %</div>
<div class='content'>{{Math.round(adata.areas[@index].load)}} W</div>
<div class='content'>{{adata.areas[@index].load}}</div>
<div class='content'><span class='{{chargingState(charging)}}'>{{chargingMode(charging)}}</span></div>
<div class='content'><span class='{{channelState(eqp)}}'>{{channelPower(eqp)}} [<span>{{channelMode(eqp)}}</span>]</span></div>
<div class='content'><span class='{{channelState(lgt)}}'>{{channelPower(lgt)}} [<span>{{channelMode(lgt)}}</span>]</span></div>

8
tgui/src/interfaces/smes.ract
View File

@@ -34,7 +34,7 @@
[<span class='{{inputState}}'>{{data.capacityPercent >= 100 ? "Fully Charged" : data.inputting ? "Charging" : "Not Charging"}}</span>]
</ui-section>
<ui-section label='Target Input'>
<ui-bar min='0' max='{{data.inputLevelMax}}' value='{{data.inputLevel}}'>{{Math.round(adata.inputLevel)}}W</ui-bar>
<ui-bar min='0' max='{{data.inputLevelMax}}' value='{{data.inputLevel}}'>{{adata.inputLevel_text}}</ui-bar>
</ui-section>
<ui-section label='Adjust Input'>
<ui-button icon='fast-backward' state='{{data.inputLevel == 0 ? "disabled" : null}}' action='input' params='{"target": "min"}'/>
@@ -44,7 +44,7 @@
<ui-button icon='fast-forward' state='{{data.inputLevel == data.inputLevelMax ? "disabled" : null}}' action='input' params='{"target": "max"}'/>
</ui-section>
<ui-section label='Available'>
<span>{{Math.round(adata.inputAvailable)}}W</span>
<span>{{adata.inputAvailable}}</span>
</ui-section>
</ui-display>
<ui-display title='Output'>
@@ -55,7 +55,7 @@
[<span class='{{outputState}}'>{{data.outputting ? "Sending" : data.charge > 0 ? "Not Sending" : "No Charge"}}</span>]
</ui-section>
<ui-section label='Target Output'>
<ui-bar min='0' max='{{data.outputLevelMax}}' value='{{data.outputLevel}}'>{{Math.round(adata.outputLevel)}}W</ui-bar>
<ui-bar min='0' max='{{data.outputLevelMax}}' value='{{data.outputLevel}}'>{{adata.outputLevel_text}}</ui-bar>
</ui-section>
<ui-section label='Adjust Output'>
<ui-button icon='fast-backward' state='{{data.outputLevel == 0 ? "disabled" : null}}' action='output' params='{"target": "min"}'/>
@@ -65,6 +65,6 @@
<ui-button icon='fast-forward' state='{{data.outputLevel == data.outputLevelMax ? "disabled" : null}}' action='output' params='{"target": "max"}'/>
</ui-section>
<ui-section label='Outputting'>
<span>{{Math.round(adata.outputUsed)}}W</span>
<span>{{adata.outputUsed}}</span>
</ui-section>
</ui-display>