From a8ec29d6438628888787ec0de6caca4073e27164 Mon Sep 17 00:00:00 2001
From: Colin McLeod <colin@roaminsight.com>
Date: Tue, 26 May 2015 11:11:26 -0700
Subject: [PATCH] Fix typo and unit spacing

---
 app/icons/infinite.svg                  | 5 +++++
 app/js/controllers/controller-import.js | 1 -
 app/views/page-outfit.html              | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100755 app/icons/infinite.svg

diff --git a/app/icons/infinite.svg b/app/icons/infinite.svg
new file mode 100755
index 00000000..7eb3a117
--- /dev/null
+++ b/app/icons/infinite.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32" viewBox="0 0 32 32">
+<path d="M24.5 23.5c-2.003 0-3.887-0.78-5.303-2.197l-3.197-3.196-3.196 3.196c-1.417 1.417-3.3 2.197-5.303 2.197s-3.887-0.78-5.304-2.197c-1.417-1.417-2.197-3.3-2.197-5.303s0.78-3.887 2.197-5.304c1.417-1.417 3.3-2.197 5.304-2.197s3.887 0.78 5.303 2.197l3.196 3.196 3.196-3.196c1.417-1.417 3.3-2.197 5.303-2.197s3.887 0.78 5.303 2.197c1.417 1.417 2.197 3.3 2.197 5.304s-0.78 3.887-2.197 5.303c-1.416 1.417-3.3 2.197-5.303 2.197zM21.304 19.197c0.854 0.853 1.989 1.324 3.196 1.323s2.342-0.47 3.196-1.324c0.854-0.854 1.324-1.989 1.324-3.196s-0.47-2.342-1.324-3.196c-0.854-0.854-1.989-1.324-3.196-1.324s-2.342 0.47-3.196 1.324l-3.196 3.196 3.196 3.197zM7.5 11.48c-1.207 0-2.342 0.47-3.196 1.324s-1.324 1.989-1.324 3.196c0 1.207 0.47 2.342 1.324 3.196s1.989 1.324 3.196 1.324c1.207 0 2.342-0.47 3.196-1.324l3.196-3.196-3.196-3.196c-0.854-0.854-1.989-1.324-3.196-1.324v0z"></path>
+</svg>
diff --git a/app/js/controllers/controller-import.js b/app/js/controllers/controller-import.js
index fa9708bd..f1971a7a 100755
--- a/app/js/controllers/controller-import.js
+++ b/app/js/controllers/controller-import.js
@@ -11,7 +11,6 @@ angular.module('app').controller('ImportController', ['$scope', '$stateParams',
     $scope.jsonValid = false;
     $scope.errorMsg = null;
     $scope.builds = null;
-    
 
     if (!$scope.importData) { return; }
 
diff --git a/app/views/page-outfit.html b/app/views/page-outfit.html
index 5e52e1ad..b8054e02 100755
--- a/app/views/page-outfit.html
+++ b/app/views/page-outfit.html
@@ -22,7 +22,7 @@
   <table id="summary">
     <thead>
       <tr class="main">
-        <th colspan="3">Manuverability</th><th colspan="2">Mass</th><th rowspan="2">Cargo</th><th rowspan="2">Fuel</th>
+        <th colspan="3">Maneouverability</th><th colspan="2">Mass</th><th rowspan="2">Cargo</th><th rowspan="2">Fuel</th>
         <th rowspan="2">Armour</th><th rowspan="2">Shields</th><th colspan="2">Power</th><th colspan="2">Jump Range</th><th rowspan="2">Cost</th>
       </tr>
       <tr>
@@ -41,8 +41,8 @@
         <td>{{fRound(ship.ladenMass)}} <u>T</u></td>
         <td>{{fRound(ship.cargoCapacity)}} <u>T</u></td>
         <td>{{fRound(ship.fuelCapacity)}} <u>T</u></td>
-        <td>{{ship.armourTotal}}<span ng-if="ship.armourAdded"> ({{ship.armour}} + {{ship.armourAdded}})</span></td>
-        <td>{{fRound(ship.shieldStrength)}} <u>Mj</u><span ng-if="ship.shieldMultiplier > 1"> ({{fRPct(ship.shieldMultiplier)}})</span></td>
+        <td>{{ship.armourTotal}} <span ng-if="ship.armourAdded">({{ship.armour}} + {{ship.armourAdded}})</span></td>
+        <td>{{fRound(ship.shieldStrength)}} <u>Mj</u> <span ng-if="ship.shieldMultiplier > 1">({{fRPct(ship.shieldMultiplier)}})</span></td>
         <td>{{fPwr(ship.powerRetracted)}} <u>MW ({{fPct(ship.powerRetracted/ship.powerAvailable)}})</u></td>
         <td>{{fPwr(ship.powerDeployed)}} <u>MW ({{fPct(ship.powerDeployed/ship.powerAvailable)}})</u></td>
         <td>{{fRound(ship.unladenJumpRange)}} <u>LY</u></td>