Cleaning up jargon and minor code changes

This commit is contained in:
Colin McLeod
2015-04-16 19:44:39 -07:00
parent aad4600326
commit 11e5c138dc
30 changed files with 67 additions and 60 deletions

View File

@@ -1,5 +1,8 @@
<div ng-repeat="c in ship.common" ng-if="c.c.power || c.c.pGen" class="list-item common" ng-class="{enabled:c.enabled, consumer:c.c.power}" ng-click="toggle(c)">
<div class="lbl">{{c.c.class}}{{c.c.rating}} {{$r.CArr[$index]}}</div><div class="val">{{$r.power(c.c.power || c.c.pGen)}}</div>
<div ng-if="ship.common[0].c.pGen" class="list-item common enabled">
<div class="lbl">{{ship.common[0].c.class}}{{ship.common[0].c.rating}} {{$r.CArr[0]}}</div><div class="val">{{$r.power(ship.common[0].c.pGen)}}</div>
</div>
<div ng-repeat="c in ship.common" ng-if="c.c.power" class="list-item common" ng-class="{enabled:c.enabled, consumer:c.c.power}" ng-click="toggle(c)">
<div class="lbl">{{c.c.class}}{{c.c.rating}} {{$r.CArr[$index]}}</div><div class="val">{{$r.power(c.c.power)}}</div>
</div>
<div class="list-item common consumer" ng-class="{enabled:ship.cargoScoop.enabled}" ng-click="toggle(ship.cargoScoop)">
<div class="lbl">1H Cargo Scoop</div><div class="val">{{$r.power(ship.cargoScoop.c.power)}}</div>

View File

@@ -13,9 +13,9 @@
<div>Pad Size: {{['','Small','Medium','Large'][ship.class]}}</div>
</fieldset>
<fieldset id="standard" class="component-group">
<fieldset id="standard" class="slot-group">
<legend>Standard</legend>
<div class="component">
<div class="slot">
<div class="lbl">Bulkheads</div>
<div class="clear">{{ship.bulkheads.c.name}}
<div class="cla">{{ship.bulkheads.c.mass}}T</div>
@@ -24,24 +24,24 @@
<div class="c" ng-repeat="b in availCS.bulkheads" ng-click="ship.use(ship.bulkheads,$index,b)">{{b.name}}</div>
</div>
</div>
<div class="component" ng-repeat="c in ship.common">
<component-details c="c" lbl="CArr[$index]"></component-details>
<div class="slot" ng-repeat="c in ship.common">
<div slot-details c="c" lbl="CArr[$index]"></div>
<div component-select class="select" c="c" ship="ship" opts="availCS.common[$index]"></div>
</div>
</fieldset>
<fieldset id="hardpoints" class="component-group">
<fieldset id="hardpoints" class="slot-group">
<legend>HardPoints</legend>
<div class="component" ng-repeat="h in ship.hardpoints">
<component-details c="h" lbl="HPC[h.maxClass]"></component-details>
<div class="slot" ng-repeat="h in ship.hardpoints">
<div slot-details c="h" lbl="HPC[h.maxClass]"></div>
<div component-select class="select" c="h" ship="ship" opts="availCS.getHps(h.maxClass)"></div>
</div>
</fieldset>
<fieldset id="internal" class="component-group">
<fieldset id="internal" class="slot-group">
<legend>Internal Compartments</legend>
<div class="component" ng-repeat="i in ship.internal">
<component-details c="i" lbl="'FIX'"></component-details>
<div class="slot" ng-repeat="i in ship.internal">
<div slot-details c="i" lbl="'FIX'"></div>
<div class="select">
<div ng-repeat="(grp, data) in availCS.getInts(i.maxClass)">
<div class="select-group">{{grp}}</div>

View File

@@ -2,5 +2,5 @@
<div class="cla">{{c.maxClass}}</div>
<div class="clear">
{{c.c.class}}{{c.c.rating}}
<div class="cla">{{c.c.mass || c.c.capacity}}T</div>
<div class="cla" ng-if="c.c">{{c.c.mass || c.c.capacity}}T</div>
</div>