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 ffd720e

Browse files
committed
frontend changes for mass traversal.
1 parent 24285f8 commit ffd720e

9 files changed

Lines changed: 67 additions & 10 deletions

File tree

app/js/core/data.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,8 @@ var Data = {
132132
start: Templates.start,
133133
system_info: Templates.system_info,
134134
wormhole_link_info: Templates.wormhole_link_info,
135-
wormhole_update_panel: Templates.wormhole_update_panel
135+
wormhole_update_panel: Templates.wormhole_update_panel,
136+
wormhole_update_traversal: Templates.wormhole_update_traversal
136137
},
137138

138139
ships: {},

app/js/core/server.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,5 +138,9 @@ var Server = {
138138

139139
postWormholeLinkUpdate: function(from, to, linkData, callback) {
140140
Server.ajaxPost('/map/jumps/' + from + '/' + to + '/', linkData, callback);
141+
},
142+
143+
postWormholeTraversalUpdate: function(from, to, traversalData, callback) {
144+
Server.ajaxPost('/map/traversals/' + from + '/' + to + '/', traversalData, callback);
141145
}
142146
};

app/js/core/ui.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,7 @@ Handlebars.registerHelper('ui_icon', function(icon) {
281281
if (icon == 'sourcedClear') return 'check';
282282
if (icon == 'sourcedClipboard') return 'clipboard';
283283
if (icon == 'sourcedHostile') return 'crosshairs';
284+
if (icon == 'traversal') return 'bus';
284285
if (icon == 'updateHostile') return 'crosshairs';
285286
if (icon == 'updateSystemMap') return 'sitemap';
286287
if (icon == 'wormhole') return 'chevron-circle-right';

app/js/core/ui_panels.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,21 @@ var UIPanels = {
178178

179179
$("#sig-a").focus();
180180
},
181+
182+
updateWormholeTraversalPanel: function (button, from_id, to_id) {
183+
var from_system = Data.systems[ from_id ];
184+
var to_system = Data.systems[ to_id ];
185+
186+
var panel = {
187+
type: 'wormhole-traversal',
188+
icon: 'wormhole',
189+
from: from_system,
190+
to: to_system,
191+
closeable: true
192+
};
193+
194+
UIPanels.showPanel(panel);
195+
},
181196

182197
showStatusPanel: function (callback) {
183198
var panel = {
@@ -235,6 +250,7 @@ var UIPanels = {
235250
showPanel: function (params, callback) {
236251
var compiledPanel = (params.type === 'start') ? $(Data.templates.start(params)) : $(Data.templates.panel(params));
237252
if (params.type === 'wormhole-update') compiledPanel = $(Data.templates.wormhole_update_panel(params));
253+
if (params.type === 'wormhole-traversal') compiledPanel = $(Data.templates.wormhole_update_traversal(params));
238254

239255
if (Data.ui.dim.children().length) {
240256

app/js/maps/wormhole_map.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ var WormholeMap = {
334334
link_a.permitted_ships = Handlebars.helpers.jump_permitted_ships(link_a.wormhole_data.mass_total);
335335
link_b.permitted_ships = Handlebars.helpers.jump_permitted_ships(link_b.wormhole_data.mass_total);
336336

337-
Data.ui.mapInfo.html( $(Data.templates.wormhole_link_info({link_a: link_a, link_b: link_b, clear_only: true})) );
337+
Data.ui.mapInfo.html( $(Data.templates.wormhole_link_info({link_a: link_a, link_b: link_b, clear_only: true, fc_only: true})) );
338338
Data.ui.mapInfo.children('div.wormhole-link-details')
339339
.fadeIn(Data.config.uiSpeed)
340340
.delay(Data.config.alertStay * 3)

app/js/overview.js

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,31 @@ function updateWormholeLink(button, from, to, data) {
6363
'<a href="javascript:CCPEVE.showInfo(5, ' + to + ')">' + Data.systems[to].name + '</a> '});
6464

6565
$('#link-'+ to + '-' + from).remove();
66-
$('#link-'+ from + '-' + to).remove()
66+
$('#link-'+ from + '-' + to).remove();
67+
});
68+
}
69+
70+
function updateWormholeTraversal(button, from, to) {
71+
var payload = {};
72+
73+
payload.mass = $('#traversal-mass').val().replace(/,/g, '');
74+
payload.fleet_name = $('#traversal-fleet').val();
75+
payload.fc_characterName = $('#traversal-fc').val();
76+
UIPanels.hidePanel();
77+
78+
Server.postWormholeTraversalUpdate(from, to, payload, function(error, data) {
79+
if (error) {
80+
handleError(error);
81+
return;
82+
}
83+
84+
EventList.addEvent({type: 'info',
85+
alert: true,
86+
text: 'Traversal logged for jump from ' +
87+
'<a href="javascript:CCPEVE.showInfo(5, ' + from + ')">' + Data.systems[from].name + '</a> ' +
88+
' to ' +
89+
'<a href="javascript:CCPEVE.showInfo(5, ' + to + ')">' + Data.systems[to].name + '</a> '});
90+
6791
});
6892
}
6993

app/styles/main.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,11 @@ html.overview #content-wrapper {
172172
padding-top: 2.5rem
173173
}
174174

175+
#dim.overview {
176+
display: none;
177+
background-image: none;
178+
}
179+
175180
#dim.client {
176181
display: none;
177182
background-image: none;

app/templates/wormhole_link_info.hbs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,20 @@
6666
<dd><a href="javascript:CCPEVE.showInfo(1377, {{link_a.wormhole_data.reporterId}});">{{link_a.wormhole_data.reporterName}}</a></dd>
6767
{{/if}}
6868
</dl>
69-
69+
7070
{{#unless read_only }}
7171
<h4>Update Link Actions</h4>
7272
{{#unless clear_only }}
7373
<a class="btn btn-info" onclick="UIPanels.updateWormholeLinkPanel(this, '{{ link_a.source.system.id }}', '{{ link_a.target.system.id}}')" title="Update">
7474
<i class="fa fa-{{ui_icon 'info'}}"></i> Update
7575
</a>
7676
{{/unless}}
77+
78+
{{#if fc_only }}
79+
<a class="btn btn-info" onclick="UIPanels.updateWormholeTraversalPanel(this, '{{ link_a.source.system.id }}', '{{ link_a.target.system.id}}')" title="Traversal">
80+
<i class="fa fa-{{ui_icon 'traversal'}}"></i> Log Traversal
81+
</a>
82+
{{/if}}
7783

7884
<a class="btn btn-danger" onclick="updateWormholeLink(this, '{{ link_a.source.system.id }}', '{{ link_a.target.system.id}}', 'Wormhole collapsed')" title="Close">
7985
<i class="fa fa-{{ui_icon 'close'}}"></i> Clear

app/templates/wormhole_update_traversal.hbs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010
<input id="from" type="hidden" value="{{ from.id }}" />
1111

1212
<div class="group inline">
13-
<label for="mass" autofocus>Fleet Mass</label>
14-
<input id="mass" type="text" />
13+
<label for="traversal-mass" autofocus>Fleet Mass</label>
14+
<input id="traversal-mass" type="text" placeholder="XX,XXX,XXX" value="50000000"/>
1515
</div>
1616

1717
<div class="group inline">
18-
<label for="name">Fleet Name</label>
19-
<input id="name" type="text" />
18+
<label for="traversal-fleet">Fleet Name</label>
19+
<input id="traversal-fleet" type="text" placeholder="Reavers" value="Reavers"/>
2020
</div>
2121

2222
<div class="group inline">
23-
<label for="fc">Fleet Commander</label>
24-
<input id="fc" type="text" />
23+
<label for="traversal-fc">FC Name</label>
24+
<input id="traversal-fc" type="text" placeholder="Asher Elias" value="Asher Elias"/>
2525
</div>
2626

2727
<div class="submit">

0 commit comments

Comments
 (0)