Skip to content
This repository was archived by the owner on Jul 6, 2022. It is now read-only.

Commit ca4ed49

Browse files
rcreaseyrcreasey
committed
Moving to gulp driven handlebars. More reliance on gulp for asset pipelining.
1 parent 8bae9b1 commit ca4ed49

15 files changed

Lines changed: 201 additions & 28 deletions

File tree

‎app/js/Data.js‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,13 @@ var Data = {
7979
},
8080

8181
templates: {
82-
hud: Handlebars.compile($('#hudTemplate').html()),
83-
hostile: Handlebars.compile($('#hostileTemplate').html()),
84-
member: Handlebars.compile($('#memberTemplate').html()),
85-
event: Handlebars.compile($('#eventTemplate').html()),
86-
alert: Handlebars.compile($('#alertTemplate').html()),
87-
scan: Handlebars.compile($('#scanTemplate').html())
82+
alert: Templates.alert,
83+
event: Templates.event,
84+
hostile: Templates.hostile,
85+
hud: Templates.hud,
86+
member: Templates.member,
87+
panel: Templates.panel,
88+
scan: Templates.scan
8889
},
8990

9091
ships: {},

‎app/js/UIPanels.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,7 @@ var UIPanels = {
185185
},
186186

187187
showPanel: function (params, callback) {
188-
var panelTemplate = Handlebars.compile($('#panelTemplate').html()),
189-
compiledPanel = $(panelTemplate(params));
188+
var compiledPanel = $(Data.templates.panel(params));
190189

191190
if (Data.ui.dim.children().length) {
192191

‎app/styles/main.css‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,6 @@ a.button,
561561
width: 14rem;
562562
text-decoration: none;
563563
color: #000;
564-
background-color:#333;
565564
padding: 0.5rem;
566565
margin: 0 auto 2.4rem;
567566
cursor: pointer;

‎app/templates/alert.hbs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<div class="event alert {{type}}" onClick="EventList.alertClick('{{type}}', '{{id}}')">
2+
{{#if type}}
3+
<img class="icon" src="/images/icon-{{type}}.png" />
4+
<span class="text">{{{text}}}</span>
5+
{{else}}
6+
<span class="text"><i class="fa fa-exclamation-triangle"></i> {{{text}}}</span>
7+
{{/if}}
8+
</div>

‎app/templates/event.hbs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<div class="event {{type}}" data-key="{{key}}">
2+
<img class="icon" src="/images/icon-{{type}}.png" />
3+
<span class="text">{{{text}}}</span>
4+
<div class="right">
5+
{{#if respondable}}
6+
<span class="response">
7+
<a href="javascript:EventList.eventResponseClick('{{key}}', 'y')">Approve</a>
8+
&nbsp;|&nbsp;
9+
<a href="javascript:EventList.eventResponseClick('{{key}}', 'n')">Deny</a>
10+
</span>
11+
{{/if}}
12+
<span class="time">{{time}}</span>
13+
</div>
14+
</div>

‎app/templates/hostile.hbs‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<table id="hostiles-list" class="hostile">
2+
<tr id="hostile-{{id}}">
3+
<td class="ship-icon">{{{shipIcon}}}</td>
4+
<td class="name"><a href="javascript:CCPEVE.showInfo(1377, {{id}});">{{name}}</a></td>
5+
<td class="alliance">
6+
{{#if allianceName}}
7+
<a href="javascript:CCPEVE.showInfo(16159, {{allianceID}});">&lt;{{allianceName}}&gt;</a>
8+
{{else}}
9+
No Alliance
10+
{{/if}}
11+
</td>
12+
<td class="ship-type" onClick="UIPanels.updateHostileDetailsPanel('{{id}}');">
13+
{{#if shipTypeId}}
14+
<i class="fa fa-eye"></i> <a href="javascript:CCPEVE.showInfo({{shipTypeId}});">{{shipType}}</a>
15+
{{else}}
16+
<i class="fa fa-eye-slash"></i> Non Visual
17+
{{/if}}
18+
</td>
19+
<td class="system {{#if isDocked}}docked{{/if}}"><a href="javascript:CCPEVE.showInfo(5,{{systemId}});">{{systemName}}</a></td>
20+
<td class="reported-at"><a title="Reported by {{reporterName}}">{{reported_at}}</a></td>
21+
<td class="actions">
22+
<a title="Set Destination" onClick="CCPEVE.setDestination({{systemId}})"><i class="fa fa-map-marker" title="Set Destination"></i></a>
23+
{{killboard_link name id}}
24+
</td>
25+
</tr>
26+
</table>

‎app/templates/hud.hbs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<div class="{{status}}">
2+
<h2>{{status}}</h2>
3+
{{#each neighbors}}
4+
{{#if system.name}}
5+
<h3>{{hostiles}} hostile{{#if hostiles}}s{{/if}} in {{system.name}}</h3>
6+
{{/if}}
7+
{{/each}}
8+
</div>

‎app/templates/member.hbs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<table class="member" id="member-{{id}}">
2+
<tr>
3+
<td class="ship-icon">{{{shipIcon}}}</td>
4+
<td class="name"><a href="javascript:CCPEVE.showInfo(1377, {{id}});">{{name}}</a></td>
5+
<td class="system {{#if isDocked}}docked{{/if}}"><a href="javascript:CCPEVE.showInfo(5,{{systemId}});">{{systemName}}</a></td>
6+
<td class="actions">
7+
<a title="Set Destination" onClick="CCPEVE.setDestination({{systemId}})"><i class="fa fa-map-marker" title="Set Destination"></i></a>
8+
<a title="Start Conversation" onClick="CCPEVE.startConversation({{id}})"><i class="fa fa-comment" title="Start Conversation"></i></a>
9+
{{killboard_link name id}}
10+
</td>
11+
</tr>
12+
</table>

‎app/templates/panel.hbs‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<div class="panel {{type}}">
2+
<div class="header">
3+
{{#if closeable}}<img class="close" src="/images/icon-close.png" alt="Close panel" onClick="UIPanels.hidePanel()" />{{/if}}
4+
{{#if image}}<img src="/images/{{image}}" alt="Panel image" />{{/if}}
5+
{{#if logo}}<img id="logo" src="/images/panel-logo.png" alt="Standing Fleet" />{{/if}}
6+
{{#if title}}<div class="text title">{{{title}}}</div>{{/if}}
7+
</div>
8+
<div class="content">
9+
{{#if text}}
10+
<div class="text {{#if textclass}}{{textclass}}{{/if}}">{{{text}}}</div>
11+
{{/if}}
12+
{{#if error}}
13+
<span class="error">{{{error.message}}}</span>
14+
{{/if}}
15+
{{#if formitems}}
16+
<div class="form">
17+
{{#each formitems}}
18+
{{#if input}}
19+
<div class="group">
20+
{{#if input.legend}}<span class="legend">{{{input.legend}}}</span>{{/if}}
21+
<input {{#if input.id}}id="{{input.id}}" {{/if}}{{#if input.class}}class="{{input.class}}" {{/if}}value="{{{input.value}}}" type={{#if input.hidden}}"hidden"{{else}}"text"{{/if}} {{#if input.readonly}}readonly="true"{{/if}} {{#if input.label}}placeholder="{{{input.label}}}"{{/if}}/>
22+
</div>
23+
{{/if}}
24+
{{#if password}}
25+
<div class="group">
26+
{{#if password.legend}}<span class="legend">{{{password.legend}}}</span>{{/if}}
27+
<input id="{{password.id}}" value="{{{password.value}}}" type="password" />
28+
</div>
29+
{{/if}}
30+
{{#if textinput}}
31+
{{#if textinput.legend}}<span class="legend">{{{textinput.legend}}}</span>{{/if}}
32+
<textarea id="{{textinput.id}}" class="textinput {{{textinput.class}}}" {{#if textinput.label}}placeholder="{{textinput.label}}"{{/if}}></textarea>
33+
{{/if}}
34+
{{#if button}}
35+
<div class="group">
36+
<a {{#if button.link}}href="{{{button.link}}}"{{/if}} target="_blank" class="button {{{button.class}}}" onClick="{{{button.onClick}}}">{{{button.text}}}</a>
37+
</div>
38+
{{/if}}
39+
{{#if submit}}
40+
<div class="submit">
41+
<a {{#if submit.link}}href="{{{submit.link}}}"{{/if}} target="_blank" class="button" onClick="{{{submit.onClick}}}">{{{submit.text}}}</a>
42+
</div>
43+
{{/if}}
44+
{{/each}}
45+
</div>
46+
{{/if}}
47+
{{#if footer}}
48+
<div class="text footer">{{{footer}}}</div>
49+
{{/if}}
50+
</div>
51+
</div>

‎app/templates/scan.hbs‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<div class="scan">
2+
<table class="description" onclick="ScanList.toggleCollapse(this);">
3+
<tr>
4+
<td class="reported-by"><a href="javascript:CCPEVE.showInfo(1377, {{reporterId}});">{{reporter}}</a> shared scan results</td>
5+
<td class="system"><a href="javascript:CCPEVE.showInfo(5,{{systemId}});">{{systemName}}</a></td>
6+
<td class="reported-at">{{time}}</td>
7+
</tr>
8+
</table>
9+
<div class="results-container collapsible">
10+
<ul class="actions">
11+
<li><a class="btn" onclick="scanFilter(this, 'grid');">On Grid</a></li>
12+
<li><a class="btn" onclick="scanFilter(this, 'offgrid');">Off Grid</a></li>
13+
</ul>
14+
<div class="scan-classes">
15+
{{#each shipClasses}}
16+
<div class="result">
17+
<span class="ship-class">{{count}}x <b>{{shipClass}}</b></span>
18+
</div>
19+
{{/each}}
20+
</div>
21+
<div class="type-classes">
22+
{{#each shipTypes}}
23+
<div class="result">
24+
<span class="ship-type" onclick="ScanList.toggleCollapse(this)">{{count}}x <b>{{shipType}}</b></span>
25+
26+
{{#each details}}
27+
<div class="details-container collapsible">
28+
<span class="ship-name">{{shipName}}</span>
29+
<span class="distance">{{distance}}</span>
30+
</div>
31+
{{/each}}
32+
</div>
33+
{{/each}}
34+
</div>
35+
</div>
36+
</div>

0 commit comments

Comments
 (0)