Lokasi ngalangkungan proxy:   [ UP ]  
[Ngawartoskeun bug]   [Panyetelan cookie]                
Skip to content
This repository was archived by the owner on Jul 6, 2022. It is now read-only.

Commit c25ba19

Browse files
committed
HUD status icons for neighbors; fixing duplicate pilot key info.
1 parent d3020b9 commit c25ba19

6 files changed

Lines changed: 14 additions & 7 deletions

File tree

app/js/EventHandler.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ var EventHandler = {
301301
Data.state.self.characterName = self.characterName;
302302
Data.state.self.characterId = self.characterId;
303303
Data.state.self.key = self.key;
304-
Data.ui.bottomMenu_pilotKey.find('i').after(" " + Data.state.self.key);
304+
Data.ui.bottomMenu_pilotKey.html('<i class="fa fa-key"></i> ' + Data.state.self.key);
305305
if (self.systemId) this.statusSelfSystem(self);
306306
},
307307

app/js/UI.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,12 @@ Handlebars.logger.level = 0;
188188
Handlebars.registerHelper('hud_status_text', UI.hud_status_text);
189189

190190
Handlebars.registerHelper('hud_neighbor_status', function(id, name) {
191-
return UI.hud_status_text( SystemMap.system_color({id: id, name: name}) );
191+
var status = SystemMap.system_color({id: id, name: name});
192+
193+
if (status == 'clear') return 'check-circle';
194+
else if (status == 'warning') return 'exclamation-triangle';
195+
else if (status == 'hostile') return 'crosshairs fa-spin fa-2x';
196+
else return 'question-circle';
192197
});
193198

194199
Handlebars.registerHelper('format_ts', function(ts) {

app/styles/main.css

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,9 @@ input.log-path {
397397
font-size: 3rem;
398398
}
399399

400+
#hud .fa {
401+
vertical-align: middle;
402+
}
400403
/*/
401404
/ / MAP
402405
*/
@@ -1283,7 +1286,7 @@ border-top: 0.16rem solid #333;
12831286
*/
12841287

12851288
.panel .start,
1286-
.linked,
1289+
.linked,
12871290
#download,
12881291
#link,
12891292
#login {

app/templates/hud.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<h3>Vicinity</h3>
77
<ul>
88
{{#each vicinity}}
9-
<li>{{ name }} : {{{hud_neighbor_status id name}}}</li>
9+
<li><i class="fa fa-{{{hud_neighbor_status id name}}}"></i> {{ name }}</li>
1010
{{else}}
1111
<li>No Connecting Systems</li>
1212
{{/each}}
1313
</ul>
1414
</div>
15-
15+
1616
<div class="hostiles">
1717
<h3>Hostiles</h3>
1818
<ul>

server/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require('newrelic');
1+
// require('newrelic');
22

33
var express = require('express')
44
, debug = require('debug')('server')

server/views/main/index.jade

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ block content
5454
#bottom-menu-spinner.menu-button
5555
img(src='/images/spinner.gif', alt='Processing...')
5656
#bottom-menu-pilot-key
57-
i.fa.fa-key(title="Pilot Key")
5857
#bottom-menu-data-client.menu-button
5958
i.fa
6059
#bottom-menu-scan.menu-button

0 commit comments

Comments
 (0)