diff --git a/app/fonts/icons.eot b/app/fonts/icons.eot
new file mode 100755
index 00000000..34279623
Binary files /dev/null and b/app/fonts/icons.eot differ
diff --git a/app/fonts/icons.svg b/app/fonts/icons.svg
new file mode 100755
index 00000000..cf7fdda4
--- /dev/null
+++ b/app/fonts/icons.svg
@@ -0,0 +1,105 @@
+
+
+
+Generated by IcoMoon
+
+
+
\ No newline at end of file
diff --git a/app/fonts/icons.ttf b/app/fonts/icons.ttf
new file mode 100755
index 00000000..87613358
Binary files /dev/null and b/app/fonts/icons.ttf differ
diff --git a/app/fonts/icons.woff b/app/fonts/icons.woff
new file mode 100755
index 00000000..3040bafe
Binary files /dev/null and b/app/fonts/icons.woff differ
diff --git a/app/index.html b/app/index.html
index 5dc32605..ffc99632 100644
--- a/app/index.html
+++ b/app/index.html
@@ -22,9 +22,9 @@
+
@@ -35,6 +35,7 @@
It is not endorsed by nor reflects the views or opinions of Frontier Developments and no employee of Frontier Developments was involved in the making of it.
+
diff --git a/app/js/controllers/controller-outfit.js b/app/js/controllers/controller-outfit.js
index 5dbfde67..0cdf0615 100644
--- a/app/js/controllers/controller-outfit.js
+++ b/app/js/controllers/controller-outfit.js
@@ -55,21 +55,22 @@ angular.module('app').controller('OutfitController', ['$rootScope','$scope', '$s
*/
$scope.select = function(type, slot, e) {
e.stopPropagation();
- if (e.srcElement.id) {
- if(type == 'h') {
- ship.use(slot, e.srcElement.id, Components.hardpoints(e.srcElement.id));
- } else if (type == 'c') {
- ship.use(slot, e.srcElement.id, Components.common(ship.common.indexOf(slot), e.srcElement.id));
- } else if (type == 'i') {
- ship.use(slot, e.srcElement.id, Components.internal(e.srcElement.id));
- } else if (type == 'b') {
- ship.useBulkhead(e.srcElement.id);
- } else {
+ var id = angular.element(e.srcElement).attr('cpid'); // Get component ID
+ if (id) {
+ if (id == 'empty') {
ship.use(slot, null, null);
+ } else if(type == 'h') {
+ ship.use(slot, id, Components.hardpoints(id));
+ } else if (type == 'c') {
+ ship.use(slot, id, Components.common(ship.common.indexOf(slot), id));
+ } else if (type == 'i') {
+ ship.use(slot, id, Components.internal(id));
+ } else if (type == 'b') {
+ ship.useBulkhead(id);
}
$scope.selectedSlot = null;
$scope.code = Serializer.fromShip(ship);
- $state.go('outfit', {shipId: ship.id, code: $scope.code, bn: $scope.buildName}, {location:'replace', notify:false});
+ updateState();
}
}
@@ -80,7 +81,7 @@ angular.module('app').controller('OutfitController', ['$rootScope','$scope', '$s
if ($scope.buildName && $scope.savedCode) {
Serializer.toShip(ship, $scope.savedCode); // Repopulate with components from last save
$scope.code = $scope.savedCode;
- $state.go('outfit', {shipId: ship.id, code: $scope.savedCode, bn: $scope.buildName}, {location:'replace', notify:false});
+ updateState();
}
};
@@ -89,11 +90,18 @@ angular.module('app').controller('OutfitController', ['$rootScope','$scope', '$s
* for this ship & with the exact name.
*/
$scope.saveBuild = function() {
- if($scope.buildName && $scope.code != $scope.savedCode) {
+ if (!$scope.buildName) {
+ return;
+ }
+ // No change hav been made, i.e. save ship default build under a name
+ if (!$scope.code) {
+ $scope.code = Serializer.fromShip(ship);
+ }
+ // Only save if there a build name and a change has been made or the build has never been saved
+ if ($scope.code != $scope.savedCode) {
Persist.saveBuild(ship.id, $scope.buildName, $scope.code);
$scope.savedCode = $scope.code;
- // Edge case TODO: comment more
- $state.go('outfit', {shipId: ship.id, code: $scope.savedCode, bn: $scope.buildName}, {location:'replace', notify:false});
+ updateState();
}
}
@@ -111,6 +119,22 @@ angular.module('app').controller('OutfitController', ['$rootScope','$scope', '$s
$scope.savedCode = Persist.getBuild(ship.id, $scope.buildName);
}
+ $scope.toggleCost = function(item) {
+ item.incCost = !item.incCost;
+ ship.updateTotals();
+ };
+
+ $scope.togglePwr = function(item) {
+ item.enabled = !item.enabled;
+ ship.updateTotals();
+ };
+
+ // Utilify functions
+ function updateState() {
+ $state.go('outfit', {shipId: ship.id, code: $scope.code, bn: $scope.buildName}, {location:'replace', notify:false});
+ }
+
+ // Event listeners
$rootScope.$on('keyup', function (e, keyEvent) {
// CTRL + S or CMD + S will override the default and save the build is possible
if (keyEvent.keycode == 83 && keyEvent.ctrlKey) {
diff --git a/app/js/directives/directive-component-select.js b/app/js/directives/directive-component-select.js
index ef7e0719..8e25da08 100644
--- a/app/js/directives/directive-component-select.js
+++ b/app/js/directives/directive-component-select.js
@@ -1,41 +1,68 @@
-angular.module('app').directive('componentSelect', [ function() {
+angular.module('app').directive('componentSelect', function() {
+
+ // Generting the HTML in this manner is MUCH faster than using an angular template.
+
+ function appendGroup(list, opts, cid, mass) {
+ var prevClass = null, prevRating = null;
+ var count = Object.keys(opts).length;
+ for (id in opts) {
+ var o = opts[id];
+ list.push('', o.class, o.rating);
+ if(o.mode) {
+ list.push('/' + o.mode);
+ if(o.missile) {
+ list.push(o.missile);
+ }
+ }
+ if(o.name) list.push(' ' + o.name);
+ list.push(' ');
+ prevClass = o.class;
+ prevRating= o.rating;
+ }
+ }
+
return {
restrict: 'A',
scope:{
- opts: '=', // Component Options object
- mass: '=' // Current ship mass
+ opts: '=', // Component Options object
+ groups: '=', // Groups of Component Options
+ mass: '=', // Current ship unladen mass
+ s: '=' // Current Slot
},
link: function(scope, element) {
- var list = [], o, id;
+ var list = [];
+ var cid = scope.s.id; // Slot's current component id
+ var component = scope.s.c; // Slot's Current Component (may be null/undefined)
var opts = scope.opts;
+ var groups = scope.groups;
var mass = scope.mass || 0;
- // Generting the HTML in this manner is MUCH faster than using an angular template.
- for (id in opts) {
- o = opts[id];
- list.push('EMPTY');
+ for (g in groups) {
+ var grp = groups[g];
+ var grpCode = grp[Object.keys(grp)[0]].grp; // Nasty operation to get the grp property of the first/any single component
+ list.push('', g, '
');
+ appendGroup(list, grp, cid, mass);
+ list.push(' ');
}
- list.push(id);
- list.push('">');
- list.push(o.class);
- list.push(o.rating);
- if(o.mode) {
- list.push('/' + o.mode);
- if(o.missile) {
- list.push(o.missile);
- }
- }
- if(o.name) {
- list.push(' ' + o.name);
- }
- list.push(' ');
+ } else {
+ list.push('');
+ appendGroup(list, opts, cid, mass);
+ list.push(' ');
}
- element.html('');
+ element.html(list.join(''));
+ // If groups are present and a component is already selectd
+ if (groups && component && component.grp) {
+ var groupElement = angular.element(document.getElementById(component.grp));
+ var parentElem = element[0].parentElement;
+ parentElem.scrollTop = groupElement[0].offsetTop; // Scroll to currently selected group
+ }
}
};
-}]);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/app/js/directives/directive-header.js b/app/js/directives/directive-header.js
index 5c1740c7..a385d73c 100644
--- a/app/js/directives/directive-header.js
+++ b/app/js/directives/directive-header.js
@@ -1,4 +1,4 @@
-angular.module('app').directive('shipyardHeader', ['$rootScope', 'Persist', function ($rootScope, Persist) {
+angular.module('app').directive('shipyardHeader', ['lodash','$rootScope', 'Persist', function (_, $rootScope, Persist) {
return {
restrict: 'E',
@@ -10,15 +10,33 @@ angular.module('app').directive('shipyardHeader', ['$rootScope', 'Persist', func
scope.allBuilds = Persist.builds;
scope.bs = Persist.state;
+ // Insurance options and management here for now.
+ $rootScope.insurance = {
+ opts: [
+ { name:'Standard', pct: 0.05 },
+ { name:'Alpha', pct: 0.025 },
+ { name:'Beta', pct: 0.035 }
+ ]
+ }
+
+ var insIndex = _.findIndex($rootScope.insurance.opts, 'name', localStorage.getItem('insurance'));
+ $rootScope.insurance.current = $rootScope.insurance.opts[insIndex != -1? insIndex : 0];
+
+ // Close menus if a navigation change event occurs
$rootScope.$on('$stateChangeStart',function(){
scope.openedMenu = null;
});
- $rootScope.$on('close', function (e, keyEvent) {
+ $rootScope.$on('close', function () {
scope.openedMenu = null;
});
- scope.openMenu = function (menu) {
+ scope.updateInsurance = function(){
+ localStorage.setItem('insurance', $rootScope.insurance.current.name);
+ }
+
+ scope.openMenu = function (e, menu) {
+ e.stopPropagation();
if(menu == scope.openedMenu) {
scope.openedMenu = null;
return;
diff --git a/app/js/directives/directive-list-cost.js b/app/js/directives/directive-list-cost.js
deleted file mode 100644
index 5f89474b..00000000
--- a/app/js/directives/directive-list-cost.js
+++ /dev/null
@@ -1,28 +0,0 @@
-angular.module('app').directive('costList', ['$rootScope', function ($r) {
- return {
- restrict: 'A',
- scope: {
- ship: '='
- },
- templateUrl: 'views/costs.html',
- link: function (scope) {
- scope.expanded = false;
- scope.$r = $r;
- scope.insuranceOptions = {
- Alpha: 0.975,
- Beta: 0.965,
- Standard: 0.95
- };
- scope.insurance = scope.insuranceOptions.Standard;
-
- scope.toggleExpand = function() {
- scope.expanded = !scope.expanded;
- }
-
- scope.toggle = function(item) {
- item.incCost = !item.incCost;
- scope.ship.updateTotals();
- };
- }
- };
-}]);
\ No newline at end of file
diff --git a/app/js/directives/directive-list-power.js b/app/js/directives/directive-list-power.js
deleted file mode 100644
index 11b74ee5..00000000
--- a/app/js/directives/directive-list-power.js
+++ /dev/null
@@ -1,23 +0,0 @@
-angular.module('app')
- .directive('powerList', ['$rootScope', function ($r) {
- return {
- restrict: 'A',
- scope: {
- ship: '=ship'
- },
- templateUrl: 'views/power.html',
- link: function (scope) {
- scope.expanded = false;
- scope.$r = $r;
-
- scope.toggleExpand = function() {
- scope.expanded = !scope.expanded;
- }
-
- scope.toggle = function(slot) {
- slot.enabled = !slot.enabled;
- scope.ship.updateTotals();
- };
- }
- };
- }]);
\ No newline at end of file
diff --git a/app/js/directives/directive-ship-range.js b/app/js/directives/directive-ship-range.js
deleted file mode 100644
index 1aa52ad7..00000000
--- a/app/js/directives/directive-ship-range.js
+++ /dev/null
@@ -1,52 +0,0 @@
-angular.module('app').directive('shipRange', ['$rootScope','calcJumpRange', function ($r, calcJumpRange) {
-
- return {
- restrict: 'A',
- scope:{
- ship: '='
- },
- templateUrl: 'views/ship-range.html',
- link: function(scope, element) {
- scope.$r = $r;
- scope.expanded = false;
- var fsd = scope.ship.common[2].c;
-
- scope.toggleExpand = function() {
- scope.expanded = !scope.expanded;
- }
-
- function ranges(fsd, unladenMass, ladenMass) {
- var ranges = [];
- for(var m = unladenMass; m <= ladenMass; m++) {
- ranges.push({x:m, y: calcJumpRange(m, fsd)});
- }
- return ranges;
- }
-
- //var fDist = d3.format(',.2f');
-
- //scope.data = ranges(fsd, scope.ship.unladenMass, scope.ship.ladenMass);
- /*scope.options = {
- axes: {
- x: {key: 'x', type: 'linear', ticks: 10},
- y: {type: 'linear', ticks: 5, }
- },
- series: [
- {y: 'y', color: '#FF8C0D', thickness: '2px', type: 'area', striped: false, label: 'Range'}
- ],
- lineMode: 'basis',
- tension: 0.7,
- tooltip: {
- mode: 'scrubber',
-
- formatter: function(x, y, series) {
- return fDist(y) + ' Light Years';
- }
- },
- drawLegend: false,
- drawDots: false,
- columnsHGap: 5
- };*/
- }
- };
-}]);
diff --git a/app/js/directives/directive-slot-hardpoint.js b/app/js/directives/directive-slot-hardpoint.js
index 6edd4c4e..b35a8b35 100644
--- a/app/js/directives/directive-slot-hardpoint.js
+++ b/app/js/directives/directive-slot-hardpoint.js
@@ -6,7 +6,7 @@ angular.module('app').directive('slotHardpoint', ['$rootScope', function ($r) {
size: '=',
lbl: '=',
},
- templateUrl: 'views/slot-hardpoint.html',
+ templateUrl: 'views/_slot-hardpoint.html',
link: function (scope) {
scope.$r = $r;
}
diff --git a/app/js/directives/directive-slot-internal.js b/app/js/directives/directive-slot-internal.js
index ba9de478..f7336149 100644
--- a/app/js/directives/directive-slot-internal.js
+++ b/app/js/directives/directive-slot-internal.js
@@ -6,7 +6,7 @@ angular.module('app').directive('slotInternal', ['$rootScope', function ($r) {
lbl: '=',
opts: '='
},
- templateUrl: 'views/slot-internal.html',
+ templateUrl: 'views/_slot-internal.html',
link: function(scope) {
scope.$r = $r;
}
diff --git a/app/js/service-serializer.js b/app/js/service-serializer.js
index 9cc80b83..0f70461a 100644
--- a/app/js/service-serializer.js
+++ b/app/js/service-serializer.js
@@ -15,7 +15,7 @@ angular.module('app').service('Serializer', ['lodash', function (_) {
_.map(ship.hardpoints, idToStr),
_.map(ship.internal, idToStr),
];
-
+ console.log('code',_.flatten(data).join(''));
return _.flatten(data).join('');
};
diff --git a/app/js/shipyard/factory-ship.js b/app/js/shipyard/factory-ship.js
index 95a385f9..05857dde 100644
--- a/app/js/shipyard/factory-ship.js
+++ b/app/js/shipyard/factory-ship.js
@@ -16,9 +16,9 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
for (p in properties) { this[p] = properties[p]; } // Copy all base properties from shipData
- for (groupName in slots) { // Initialize all slots
- var slotGroup = slots[groupName];
- var group = this[groupName] = []; // Initialize Slot group (Common, Hardpoints, Internal)
+ for (slotType in slots) { // Initialize all slots
+ var slotGroup = slots[slotType];
+ var group = this[slotType] = []; // Initialize Slot group (Common, Hardpoints, Internal)
for(var i = 0; i < slotGroup.length; i++){
group.push({id: null, c: null, enabled: true, incCost: true, maxClass: slotGroup[i]});
}
@@ -115,10 +115,6 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
return sum;
}
- function findInternal(slots, group) {
-
- }
-
Ship.prototype.useBulkhead = function(index) {
this.bulkheads.id = index;
this.bulkheads.c = DB.components.bulkheads[this.id][index];
@@ -145,7 +141,7 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
}
} else {
// Selected component is a Shield Generator
- if(component.group == 'sg') {
+ if(component.grp == 'sg') {
// You can only have one shield Generator
if (this.sgSI !== null && this.sgSI != slotIndex) {
// A shield generator is already selected in a different slot
diff --git a/app/less/fonts.less b/app/less/fonts.less
index 99d3187f..b738157d 100644
--- a/app/less/fonts.less
+++ b/app/less/fonts.less
@@ -44,7 +44,6 @@
url('fonts/sintony-bold-webfont.svg#sintonybold') format('svg');
font-weight: normal;
font-style: normal;
-
}
@font-face {
@@ -57,7 +56,6 @@
url('fonts/sintony-regular-webfont.svg#sintonyregular') format('svg');
font-weight: normal;
font-style: normal;
-
}
@font-face {
@@ -70,7 +68,17 @@
url('fonts/eurocaps-webfont.svg#euro_capsregular') format('svg');
font-weight: normal;
font-style: normal;
+}
+@font-face {
+ font-family: 'icons';
+ src:url('fonts/icons.eot?-dwuzoa');
+ src:url('fonts/icons.eot?#iefix-dwuzoa') format('embedded-opentype'),
+ url('fonts/icons.woff?-dwuzoa') format('woff'),
+ url('fonts/icons.ttf?-dwuzoa') format('truetype'),
+ url('fonts/icons.svg?-dwuzoa#icons') format('svg');
+ font-weight: normal;
+ font-style: normal;
}
@fStandard: 'eurocaps', Helvetica, sans-serif;
diff --git a/app/less/header.less b/app/less/header.less
index 23f8d35a..af509a8e 100644
--- a/app/less/header.less
+++ b/app/less/header.less
@@ -14,6 +14,12 @@ header {
position: relative;
z-index: 1;
cursor: default;
+
+ &.r {
+ .menu-list {
+ right: 0;
+ }
+ }
}
.menu-header {
@@ -37,14 +43,18 @@ header {
}
.menu-list {
- width: 250%;
+ width: 25em;
font-family: @fStandard;
position: absolute;
- margin-right: 1em;
padding: 0 0 1em 1em;
overflow: hidden;
background-color: @bgBlack;
font-size: 0.8em;
+
+ &.sm {
+ width: 15em;
+ }
+
}
ul {
diff --git a/app/less/icons.less b/app/less/icons.less
index bb412dcb..4e55aa4e 100644
--- a/app/less/icons.less
+++ b/app/less/icons.less
@@ -31,28 +31,407 @@
height: 3em;
}
-.mount-T {
- background-image: url(images/icons/mount-t.svg);
-}
-.mount-F {
- background-image: url(images/icons/mount-f.svg);
-}
-.mount-G {
- background-image: url(images/icons/mount-g.svg);
-}
-
.shipyard {
background-image: url(images/icons/logo.svg);
}
-.github {
- background-image: url(images/icons/github-mark.svg);
-}
-
.reddit {
background-image: url(images/icons/reddit.svg);
}
-.elite-dangerous {
- background-image: url(images/ed-logo-sm.png);
-}
\ No newline at end of file
+
+.ico-l {
+ font-size: 2em;
+}
+
+.ico-xl {
+ font-size: 3em;
+}
+
+.ico {
+ font-family: 'icons';
+ font-variant: normal;
+ text-transform: none;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+
+.ico-coin-dollar:before {
+ content: "\e93b";
+}
+
+.ico-download:before {
+ content: "\e960";
+}
+
+.ico-upload:before {
+ content: "\e961";
+}
+
+.ico-floppy-disk:before {
+ content: "\e962";
+}
+
+.ico-spinner4:before {
+ content: "\e97d";
+}
+
+.ico-spinner11:before {
+ content: "\e984";
+}
+
+.ico-enlarge:before {
+ content: "\e989";
+}
+
+.ico-shrink:before {
+ content: "\e98a";
+}
+
+.ico-enlarge2:before {
+ content: "\e98b";
+}
+
+.ico-shrink2:before {
+ content: "\e98c";
+}
+
+.ico-wrench:before {
+ content: "\e991";
+}
+
+.ico-equalizer:before {
+ content: "\e992";
+}
+
+.ico-equalizer2:before {
+ content: "\e993";
+}
+
+.ico-cog:before {
+ content: "\e994";
+}
+
+.ico-cogs:before {
+ content: "\e995";
+}
+
+.ico-hammer:before {
+ content: "\e996";
+}
+
+.ico-pie-chart:before {
+ content: "\e99a";
+}
+
+.ico-stats-dots:before {
+ content: "\e99b";
+}
+
+.ico-stats-bars:before {
+ content: "\e99c";
+}
+
+.ico-stats-bars2:before {
+ content: "\e99d";
+}
+
+.ico-rocket:before {
+ content: "\e9a5";
+}
+
+.ico-meter:before {
+ content: "\e9a6";
+}
+
+.ico-meter2:before {
+ content: "\e9a7";
+}
+
+.ico-bin:before {
+ content: "\e9ac";
+}
+
+.ico-target:before {
+ content: "\e9b3";
+}
+
+.ico-shield:before {
+ content: "\e9b4";
+}
+
+.ico-power:before {
+ content: "\e9b5";
+}
+
+.ico-switch:before {
+ content: "\e9b6";
+}
+
+.ico-power-cord:before {
+ content: "\e9b7";
+}
+
+.ico-clipboard:before {
+ content: "\e9b8";
+}
+
+.ico-tree:before {
+ content: "\e9bc";
+}
+
+.ico-menu:before {
+ content: "\e9bd";
+}
+
+.ico-menu2:before {
+ content: "\e9be";
+}
+
+.ico-menu3:before {
+ content: "\e9bf";
+}
+
+.ico-menu4:before {
+ content: "\e9c0";
+}
+
+.ico-cloud:before {
+ content: "\e9c1";
+}
+
+.ico-cloud-download:before {
+ content: "\e9c2";
+}
+
+.ico-cloud-upload:before {
+ content: "\e9c3";
+}
+
+.ico-cloud-check:before {
+ content: "\e9c4";
+}
+
+.ico-link:before {
+ content: "\e9cb";
+}
+
+.ico-warning:before {
+ content: "\ea07";
+}
+
+.ico-notification:before {
+ content: "\ea08";
+}
+
+.ico-question:before {
+ content: "\ea09";
+}
+
+.ico-plus:before {
+ content: "\ea0a";
+}
+
+.ico-minus:before {
+ content: "\ea0b";
+}
+
+.ico-info:before {
+ content: "\ea0c";
+}
+
+.ico-cancel-circle:before {
+ content: "\ea0d";
+}
+
+.ico-blocked:before {
+ content: "\ea0e";
+}
+
+.ico-cross:before {
+ content: "\ea0f";
+}
+
+.ico-checkmark:before {
+ content: "\ea10";
+}
+
+.ico-checkmark2:before {
+ content: "\ea11";
+}
+
+.ico-loop:before {
+ content: "\ea2d";
+}
+
+.ico-loop2:before {
+ content: "\ea2e";
+}
+
+.ico-infinite:before {
+ content: "\ea2f";
+}
+
+.ico-shuffle:before {
+ content: "\ea30";
+}
+
+.ico-arrow-up-left:before {
+ content: "\ea31";
+}
+
+.ico-arrow-up:before {
+ content: "\ea32";
+}
+
+.ico-arrow-up-right:before {
+ content: "\ea33";
+}
+
+.ico-arrow-right:before {
+ content: "\ea34";
+}
+
+.ico-arrow-down-right:before {
+ content: "\ea35";
+}
+
+.ico-arrow-down:before {
+ content: "\ea36";
+}
+
+.ico-arrow-down-left:before {
+ content: "\ea37";
+}
+
+.ico-arrow-left:before {
+ content: "\ea38";
+}
+
+.ico-arrow-up-left2:before {
+ content: "\ea39";
+}
+
+.ico-arrow-up2:before {
+ content: "\ea3a";
+}
+
+.ico-arrow-up-right2:before {
+ content: "\ea3b";
+}
+
+.ico-arrow-right2:before {
+ content: "\ea3c";
+}
+
+.ico-arrow-down-right2:before {
+ content: "\ea3d";
+}
+
+.ico-arrow-down2:before {
+ content: "\ea3e";
+}
+
+.ico-arrow-down-left2:before {
+ content: "\ea3f";
+}
+
+.ico-arrow-left2:before {
+ content: "\ea40";
+}
+
+.ico-circle-up:before {
+ content: "\ea41";
+}
+
+.ico-circle-right:before {
+ content: "\ea42";
+}
+
+.ico-circle-down:before {
+ content: "\ea43";
+}
+
+.ico-circle-left:before {
+ content: "\ea44";
+}
+
+.ico-tab:before {
+ content: "\ea45";
+}
+
+.ico-move-up:before {
+ content: "\ea46";
+}
+
+.ico-move-down:before {
+ content: "\ea47";
+}
+
+.ico-sort-alpha-asc:before {
+ content: "\ea48";
+}
+
+.ico-sort-alpha-desc:before {
+ content: "\ea49";
+}
+
+.ico-sort-numeric-asc:before {
+ content: "\ea4a";
+}
+
+.ico-sort-numberic-desc:before {
+ content: "\ea4b";
+}
+
+.ico-sort-amount-asc:before {
+ content: "\ea4c";
+}
+
+.ico-sort-amount-desc:before {
+ content: "\ea4d";
+}
+
+.ico-checkbox-checked:before {
+ content: "\ea52";
+}
+
+.ico-checkbox-unchecked:before {
+ content: "\ea53";
+}
+
+.ico-radio-checked:before {
+ content: "\ea54";
+}
+
+.ico-radio-checked2:before {
+ content: "\ea55";
+}
+
+.ico-radio-unchecked:before {
+ content: "\ea56";
+}
+
+.ico-table:before {
+ content: "\ea70";
+}
+
+.ico-table2:before {
+ content: "\ea71";
+}
+
+.ico-share:before {
+ content: "\ea7d";
+}
+
+.ico-share2:before {
+ content: "\ea82";
+}
+
+.ico-github:before {
+ content: "\eab1";
+}
+
+.ico-github4:before {
+ content: "\eab4";
+}
diff --git a/app/less/outfit.less b/app/less/outfit.less
index cb453150..2c4608e6 100644
--- a/app/less/outfit.less
+++ b/app/less/outfit.less
@@ -69,11 +69,3 @@ u { // Unit (Mj, Km, etc)
cursor: pointer;
}
-.expandable {
- display: none;
-
- &.expanded {
- display: block;
- }
-}
-
diff --git a/app/less/select.less b/app/less/select.less
index 7a8ac884..d4374a39 100644
--- a/app/less/select.less
+++ b/app/less/select.less
@@ -31,6 +31,9 @@
cursor: not-allowed;
color: @disabled;
}
+ &.active {
+ color: @secondary;
+ }
}
@optionSpacing: 1.8em;
@@ -48,12 +51,12 @@
&.hardpoint {
.c {
width: 4em;
- &:nth-child(3n + 1) {
+ /* &:nth-child(3n + 1) {
clear: left;
}
&:nth-child(5n +1) {
clear: none;
- }
+ }*/
}
}
@@ -71,13 +74,16 @@
border:1px solid @warning;
}
- &:nth-child(5n +1) {
+ /*&:nth-child(5n +1) {
clear: left;
- }
+ }*/
&.disabled {
border:1px solid @disabled;
}
+ &.active {
+ border:1px solid @secondary;
+ }
}
ul {
@@ -87,6 +93,4 @@
list-style: none;
overflow: hidden;
}
-
-
-}
\ No newline at end of file
+}
diff --git a/app/views/_header.html b/app/views/_header.html
index 44cf4499..60b0f2f0 100644
--- a/app/views/_header.html
+++ b/app/views/_header.html
@@ -2,15 +2,15 @@
diff --git a/app/views/page-outfit.html b/app/views/page-outfit.html
index 18c622f4..cf8d7c02 100644
--- a/app/views/page-outfit.html
+++ b/app/views/page-outfit.html
@@ -4,11 +4,8 @@
@@ -23,11 +20,11 @@
{{ship.bulkheads.c.mass}} T
- Lightweight Alloy
- Reinforced Alloy
- Military Grade Composite
- Mirrored Surface Composite
- Reactive Surface Composite
+ Lightweight Alloy
+ Reinforced Alloy
+ Military Grade Composite
+ Mirrored Surface Composite
+ Reactive Surface Composite
@@ -40,7 +37,7 @@
Power: {{pp.c.pGen}} MW
{{pp.c.mass}} T
+
@@ -52,7 +49,7 @@
Max: {{th.c.maxmass}} T
{{th.c.mass}} T
-
+
@@ -64,7 +61,7 @@
Max Fuel: {{fsd.c.maxfuel}} T
{{fsd.c.mass}} T
-
+
@@ -75,7 +72,7 @@
Time: {{fTime(ls.c.time)}}
{{ls.c.mass}} T
-
+
@@ -88,7 +85,7 @@
Eng: {{pd.c.enginecapacity}} Mj {{pd.c.enginerecharge}}Mj/s
{{pd.c.mass}} T
-
+
@@ -99,7 +96,7 @@
{{ss.c.range}} KM
{{ss.c.mass}} T
-
+
@@ -108,20 +105,16 @@
{{ft.id}}
{{ft.c.capacity}} T
-
+
@@ -131,12 +124,13 @@
Save
- Reload
+ Save
+ Reload
Delete
- Reset
+ Reset
+
@@ -145,6 +139,7 @@
Agility
{{ship.agility}} / 10
+
@@ -155,6 +150,7 @@
Multiplier
{{fRPct(ship.shieldMultiplier)}}
+
+
@@ -171,7 +168,46 @@
Unladen
{{fRound(ship.unladenMass)}} T
-
+
+
+
+
+
+
{{pp.c.class}}{{pp.c.rating}} Power Plant
{{fPwr(pp.c.pGen)}}
+
+
+
+
{{c.c.class}}{{c.c.rating}} {{CArr[$index]}}
{{fPwr(c.c.power)}}
+
+
+
+
1H Cargo Scoop
{{fPwr(ship.cargoScoop.c.power)}}
+
+
+
+
{{c.c.class}}{{c.c.rating}} {{c.c.name || hgMap[c.c.grp]}}
{{fPwr(c.c.power)}}
+
+
+
+
{{c.c.class}}{{c.c.rating}} {{c.c.name || igMap[c.c.grp]}}
{{fPwr(c.c.power)}}
+
+
+
+
+
Available
+
{{fPwr(ship.powerAvailable)}} MW
+
+
+
Deployed
+
{{fPwr(ship.powerDeployed)}} MW ({{fPct(ship.powerDeployed/ship.powerAvailable)}})
+
+
+
Retracted
+
{{fPwr(ship.powerRetracted)}} MW ({{fPct(ship.powerRetracted/ship.powerAvailable)}})
+
+
+
@@ -179,8 +215,55 @@
Fuel
{{fRound(ship.fuelCapacity)}} T
-
-
+
+
+
+
+
+ Stuff!
+
+
+
+
Laden
+
{{fRound(ship.ladenJumpRange)}} LY
+
+
+
Unladen
+
{{fRound(ship.unladenJumpRange)}} LY
+
+
+
+
+
+
+
{{ship.name}}
{{fCrd(ship.cost)}}
+
+
+
{{ship.bulkheads.c.name}}
{{fCrd(ship.bulkheads.c.cost)}}
+
+
+
{{c.c.class}}{{c.c.rating}} {{CArr[$index]}}
{{fCrd(c.c.cost)}}
+
+
+
{{c.c.class}}{{c.c.rating}} {{c.c.name || hgMap[c.c.grp]}}
{{fCrd(c.c.cost)}}
+
+
+
{{c.c.class}}{{c.c.rating}} {{c.c.name || igMap[c.c.grp]}}
{{fCrd(c.c.cost)}}
+
+
+
+
+
Total
+
{{fCrd(ship.totalCost)}} CR
+
+
+
Insurance
+
{{fCrd(ship.totalCost * insurance.current.pct)}} CR
+
+
+
-
-
{{ship.common[0].c.class}}{{ship.common[0].c.rating}} {{$r.CArr[0]}}
{{$r.fPwr(ship.common[0].c.pGen)}}
-
-
-
-
{{c.c.class}}{{c.c.rating}} {{$r.CArr[$index]}}
{{$r.fPwr(c.c.power)}}
-
-
-
-
1H Cargo Scoop
{{$r.fPwr(ship.cargoScoop.c.power)}}
-
-
-
-
{{c.c.class}}{{c.c.rating}} {{c.c.name || $r.hgMap[c.c.grp]}}
{{$r.fPwr(c.c.power)}}
-
-
-
-
{{c.c.class}}{{c.c.rating}} {{c.c.name || $r.igMap[c.c.group]}}
{{$r.fPwr(c.c.power)}}
-
-
-
-
Available
-
{{$r.fPwr(ship.powerAvailable)}} MW
-
-
-
Deployed
-
{{$r.fPwr(ship.powerDeployed)}} MW ({{$r.fPct(ship.powerDeployed/ship.powerAvailable)}})
-
-
-
Retracted
-
{{$r.fPwr(ship.powerRetracted)}} MW ({{$r.fPct(ship.powerRetracted/ship.powerAvailable)}})
-
-
-
- Stuff!
-
-
-
-
Laden
-
{{$r.fRound(ship.ladenJumpRange)}} LY
-
-
-
Unladen
-
{{$r.fRound(ship.unladenJumpRange)}} LY
-
-