chmod all files, rsync for deploy, cdn support, build page borked

cmmcleod · May 26, 2015 · 0a7494e · 0a7494e
1 parent 7bab67d
commit 0a7494e
Show file tree

Hide file tree

Showing 148 changed files with 150 additions and 153 deletions.
diff --git a/app/.htaccess → .htaccess b/app/.htaccess → .htaccess
@@ -10,7 +10,7 @@
     # Activate mod_expires for this directory
     ExpiresActive on
 
-    ExpiresDefault                  "access plus 365 days"
+    ExpiresDefault                  "access"
     ExpiresByType text/html         "access"
     ExpiresByType application/json  "access"
 </IfModule>

diff --git a/README.md b/README.md
diff --git a/app/icons/coriolis.svg b/app/icons/coriolis.svg
diff --git a/app/icons/github-mark.svg b/app/icons/github-mark.svg
diff --git a/app/icons/mount-F.svg b/app/icons/mount-F.svg
diff --git a/app/icons/mount-G.svg b/app/icons/mount-G.svg
diff --git a/app/icons/mount-T.svg b/app/icons/mount-T.svg
diff --git a/app/images/bay-1920x1080.jpg b/app/images/bay-1920x1080.jpg
diff --git a/app/images/deep-space-1920x1080.jpg b/app/images/deep-space-1920x1080.jpg
diff --git a/app/images/logo/android-chrome-144x144.png b/app/images/logo/android-chrome-144x144.png
diff --git a/app/images/logo/android-chrome-192x192.png b/app/images/logo/android-chrome-192x192.png
diff --git a/app/images/logo/android-chrome-72x72.png b/app/images/logo/android-chrome-72x72.png
diff --git a/app/images/logo/android-chrome-96x96.png b/app/images/logo/android-chrome-96x96.png
diff --git a/app/images/logo/apple-touch-icon-114x114.png b/app/images/logo/apple-touch-icon-114x114.png
diff --git a/app/images/logo/apple-touch-icon-120x120.png b/app/images/logo/apple-touch-icon-120x120.png
diff --git a/app/images/logo/apple-touch-icon-144x144.png b/app/images/logo/apple-touch-icon-144x144.png
diff --git a/app/images/logo/apple-touch-icon-152x152.png b/app/images/logo/apple-touch-icon-152x152.png
diff --git a/app/images/logo/apple-touch-icon-180x180.png b/app/images/logo/apple-touch-icon-180x180.png
diff --git a/app/images/logo/apple-touch-icon-76x76.png b/app/images/logo/apple-touch-icon-76x76.png
diff --git a/app/images/logo/apple-touch-icon-precomposed.png b/app/images/logo/apple-touch-icon-precomposed.png
diff --git a/app/images/logo/apple-touch-icon.png b/app/images/logo/apple-touch-icon.png
diff --git a/app/images/logo/browserconfig.xml b/app/images/logo/browserconfig.xml
diff --git a/app/images/logo/favicon-194x194.png b/app/images/logo/favicon-194x194.png
diff --git a/app/images/logo/favicon-96x96.png b/app/images/logo/favicon-96x96.png
diff --git a/app/images/logo/favicon.ico b/app/images/logo/favicon.ico
diff --git a/app/images/logo/manifest.json b/app/images/logo/manifest.json
diff --git a/app/images/logo/mstile-144x144.png b/app/images/logo/mstile-144x144.png
diff --git a/app/images/logo/mstile-150x150.png b/app/images/logo/mstile-150x150.png
diff --git a/app/images/logo/mstile-310x150.png b/app/images/logo/mstile-310x150.png
diff --git a/app/images/logo/mstile-310x310.png b/app/images/logo/mstile-310x310.png
diff --git a/app/images/logo/mstile-70x70.png b/app/images/logo/mstile-70x70.png
diff --git a/app/index.html b/app/index.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html ng-app="app" ng-strict-di="true">
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   <title ng-bind="title">Coriolis</title>
   <link rel="stylesheet" href="/app.css">
   <link rel="apple-touch-icon" sizes="76x76" href="/images/logo/apple-touch-icon-76x76.png">

diff --git a/app/js/app.js b/app/js/app.js
diff --git a/app/js/config.js b/app/js/config.js
diff --git a/app/js/controllers/controller-comparison.js b/app/js/controllers/controller-comparison.js
@@ -18,7 +18,7 @@ angular.module('app').controller('ComparisonController', ['lodash', '$rootScope'
    */
   $scope.addBuild = function (shipId, buildName, code) {
     var data = Ships[shipId];   // Get ship properties
-    var code = code? code : Persist.builds[shipId][buildName]; // Retrieve build code if not passed
+    code = code? code : Persist.builds[shipId][buildName]; // Retrieve build code if not passed
     var b = new Ship(shipId, data.properties, data.slots); // Create a new Ship instance
     Serializer.toShip(b, code);  // Populate components from code
     // Extend ship instance and add properties below
@@ -153,28 +153,29 @@ angular.module('app').controller('ComparisonController', ['lodash', '$rootScope'
       $scope.desc
     );
     return $state.href('comparison', {code: code}, {absolute:true});
-  };
+  }
 
   /* Event listeners */
   $scope.$on('close', function() {
     $scope.showBuilds = false;
   });
 
   /* Initialization */
+  var shipId, buildName, comparisonData;
   if ($scope.compareMode) {
     if ($scope.name == 'all') {
-      for (var shipId in Persist.builds) {
-        for (var buildName in Persist.builds[shipId]) {
+      for (shipId in Persist.builds) {
+        for (buildName in Persist.builds[shipId]) {
           $scope.addBuild(shipId, buildName);
         }
       }
     } else {
-      for (var shipId in Persist.builds) {
-        for (var buildName in Persist.builds[shipId]) {
+      for (shipId in Persist.builds) {
+        for (buildName in Persist.builds[shipId]) {
           $scope.unusedBuilds.push({id: shipId, buildName: buildName, name: Ships[shipId].properties.name});
         }
       }
-      var comparisonData = Persist.getComparison($scope.name);
+      comparisonData = Persist.getComparison($scope.name);
       if (comparisonData) {
         defaultFacets = comparisonData.facets;
         comparisonData.builds.forEach(function (b) {
@@ -185,9 +186,9 @@ angular.module('app').controller('ComparisonController', ['lodash', '$rootScope'
     }
   } else {
     try {
-      var comparisonData = Serializer.toComparison($stateParams.code);
+      comparisonData = Serializer.toComparison($stateParams.code);
       defaultFacets = comparisonData.f;
-      $scope.name = comparisonData.n
+      $scope.name = comparisonData.n;
       $scope.predicate = comparisonData.p;
       $scope.desc = comparisonData.d;
       comparisonData.b.forEach(function (build) {

diff --git a/app/js/controllers/controller-delete.js b/app/js/controllers/controller-delete.js
diff --git a/app/js/controllers/controller-error.js b/app/js/controllers/controller-error.js
diff --git a/app/js/controllers/controller-export.js b/app/js/controllers/controller-export.js
diff --git a/app/js/controllers/controller-import.js b/app/js/controllers/controller-import.js
diff --git a/app/js/controllers/controller-link.js b/app/js/controllers/controller-link.js
diff --git a/app/js/controllers/controller-modal.js b/app/js/controllers/controller-modal.js
diff --git a/app/js/controllers/controller-outfit.js b/app/js/controllers/controller-outfit.js
diff --git a/app/js/controllers/controller-shipyard.js b/app/js/controllers/controller-shipyard.js
diff --git a/app/js/directives/directive-area-chart.js b/app/js/directives/directive-area-chart.js
diff --git a/app/js/directives/directive-bar-chart.js b/app/js/directives/directive-bar-chart.js
@@ -1,4 +1,4 @@
-angular.module('app').directive('barChart', ['$rootScope', function ($rootScope) {
+angular.module('app').directive('barChart', function () {
 
   function bName (build) {
     return build.buildName + '\n' + build.name;
@@ -118,4 +118,4 @@ angular.module('app').directive('barChart', ['$rootScope', function ($rootScope)
 
     }
   };
-}]);
+});
diff --git a/app/js/directives/directive-comparison-table.js b/app/js/directives/directive-comparison-table.js
diff --git a/app/js/directives/directive-component-select.js b/app/js/directives/directive-component-select.js
diff --git a/app/js/directives/directive-header.js b/app/js/directives/directive-header.js
diff --git a/app/js/directives/directive-slot-hardpoint.js b/app/js/directives/directive-slot-hardpoint.js
diff --git a/app/js/directives/directive-slot-internal.js b/app/js/directives/directive-slot-internal.js
diff --git a/app/js/factory-utils.js b/app/js/factory-utils.js
@@ -12,12 +12,12 @@ angular.module('app').factory('Utils', ['$state','$http', function ($state, $htt
   }
 
   function comparisonBBCode(facets, builds, link) {
-    var colCount = 2, i,j,k, l = [];
+    var colCount = 2, b, i, j, k, f, fl, p, pl, l = [];
 
     for (i = 0; i < facets.length; i++) {
       if (facets[i].active) {
-        var f = facets[i];
-        var p = f.props;
+        f = facets[i];
+        p = f.props;
 
         if (p.length == 1) {
           l.push('[th][B][COLOR=#FF8C0D]', f.title, '[/COLOR][/B][/th]');
@@ -33,15 +33,15 @@ angular.module('app').factory('Utils', ['$state','$http', function ($state, $htt
     l.push('[/tr]\n');
 
     for (i = 0; i < builds.length; i++) {
-      var b = builds[i];
+      b = builds[i];
       //var href = $state.href('outfit',{shipId: b.id, code: b.code, bn: b.buildName}, {absolute: true});
       l.push('[tr][td]', b.name,'[/td][td]', b.buildName ,'[/td]');
 
       for (j = 0, fl = facets.length; j < fl; j++) {
         if (facets[j].active) {
-          var f = facets[j];
-          var p = f.props;
-          for (var k = 0, pl = p.length; k < pl; k++) {
+          f = facets[j];
+          p = f.props;
+          for (k = 0, pl = p.length; k < pl; k++) {
             l.push('[td="align: right"]', f.fmt(b[p[k]]), ' [size=-2]', f.unit, '[/size][/td]');
           }
         }

diff --git a/app/js/service-persist.js b/app/js/service-persist.js
@@ -90,10 +90,10 @@ angular.module('app').service('Persist', ['$window','lodash', function ($window,
     this.comparisons[name] = {
       facets: facets,
       builds: _.map(builds, function (b) { return {shipId: b.id, buildName: b.buildName }; })
-    }
+    };
     localStorage.setItem(LS_KEY_COMPARISONS, angular.toJson(this.comparisons));
     this.state.hasComparisons = true;
-  }
+  };
 
   /**
    * [getComparison description]
@@ -105,7 +105,7 @@ angular.module('app').service('Persist', ['$window','lodash', function ($window,
       return this.comparisons[name];
     }
     return null;
-  }
+  };
 
   /**
    * Removes the comparison from localstorage.
@@ -117,7 +117,7 @@ angular.module('app').service('Persist', ['$window','lodash', function ($window,
       localStorage.setItem(LS_KEY_COMPARISONS, angular.toJson(this.comparisons));
       this.state.hasComparisons = Object.keys(this.comparisons).length > 0;
     }
-  }
+  };
 
   /**
    * Delete all builds and comparisons from localStorage

diff --git a/app/js/service-serializer.js b/app/js/service-serializer.js
@@ -68,11 +68,11 @@ angular.module('app').service('Serializer', ['lodash', function (_) {
       p: predicate,
       d: desc? 1 : 0
     })).replace(/\//g,'-');
-  }
+  };
 
   this.toComparison = function (code) {
     return angular.fromJson(LZString.decompressFromBase64(code.replace(/-/g,'/')));
-  }
+  };
 
   /**
    * Utility function to retrieve a safe string for selected component for a slot.

diff --git a/app/js/shipyard/factory-component-set.js b/app/js/shipyard/factory-component-set.js
diff --git a/app/js/shipyard/factory-ship.js b/app/js/shipyard/factory-ship.js
diff --git a/app/js/shipyard/module-shipyard.js b/app/js/shipyard/module-shipyard.js
diff --git a/app/js/shipyard/service-components.js b/app/js/shipyard/service-components.js
diff --git a/app/less/app.less b/app/less/app.less
diff --git a/app/less/background-images.less b/app/less/background-images.less
diff --git a/app/less/buttons.less b/app/less/buttons.less
diff --git a/app/less/chart-tooltip.less b/app/less/chart-tooltip.less
diff --git a/app/less/charts.less b/app/less/charts.less
diff --git a/app/less/colors.less b/app/less/colors.less
@@ -20,6 +20,12 @@
 @secondary-bg: fadeout(darken(@secondary, @bgDarken), @bgTransparency); // Brown background
 @warning-bg: fadeout(darken(@warning, @bgDarken), @bgTransparency); // Dark Red
 
+
+.fg {
+  color: @fg;
+  fill: @fg;
+}
+
 .disabled {
   color: @disabled;
   fill: @disabled;

diff --git a/app/less/comparison.less b/app/less/comparison.less
diff --git a/app/less/error.less b/app/less/error.less
diff --git a/app/less/fonts.less b/app/less/fonts.less
diff --git a/app/less/header.less b/app/less/header.less
@@ -80,7 +80,7 @@ header {
     text-decoration: none;
 
     &.name {
-      font-family: Helvetica, sans-serif;
+      font-family: Helvetica, Arial, sans-serif;
     }
 
     &:visited {

diff --git a/app/less/icons.less b/app/less/icons.less
diff --git a/app/less/list.less b/app/less/list.less
@@ -68,8 +68,4 @@
     }
   }
 
-  &:nth-child(n+2) {
-    border-top: 1px solid @primary;
-  }
-
 }
diff --git a/app/less/modal.less b/app/less/modal.less
diff --git a/app/less/outfit.less b/app/less/outfit.less
@@ -17,15 +17,13 @@
 
   input {
     background: none;
-    color: @primary-disabled;
-    outline: none;
     line-height: 1.5em;
     font-size: 0.8em;
-    border: 1px solid @primary-disabled;
     box-sizing: border-box;
     display: inline-block;
     padding: 0.5em;
-    &:hover, &:focus {
+
+    &:focus {
       border: 1px solid @primary;
       color: @primary;
     }
@@ -54,13 +52,12 @@
 
 #summary {
   .user-select-none();
-  float: right;
-  min-width: 40em;
-  margin: 0.25em;
-  border-top: 2px solid @primary;
-  border-bottom: 2px solid @primary;
-  background-color: @primary-bg;
-  text-align: left;
+  margin: 0;
+  border-collapse: collapse;
+
+  tbody td {
+    padding: 0 0.5em;
+  }
 }
 
 .toggle {

diff --git a/app/less/select.less b/app/less/select.less
diff --git a/app/less/shipyard.less b/app/less/shipyard.less
diff --git a/app/less/slot.less b/app/less/slot.less
diff --git a/app/less/sortable.less b/app/less/sortable.less
diff --git a/app/less/table.less b/app/less/table.less
diff --git a/app/less/utilities.less b/app/less/utilities.less
@@ -29,3 +29,19 @@
   -ms-user-select: none;
   user-select: none;
 }
+
+.vertical {
+  -webkit-transform: rotate(-90deg);
+  -moz-transform: rotate(-90deg);
+  -ms-transform: rotate(-90deg);
+  -o-transform: rotate(-90deg);
+  transform: rotate(-90deg);
+
+  -webkit-transform-origin: 50% 50%;
+  -moz-transform-origin: 50% 50%;
+  -ms-transform-origin: 50% 50%;
+  -o-transform-origin: 50% 50%;
+  transform-origin: 50% 50%;
+
+  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
+}
diff --git a/app/views/_header.html b/app/views/_header.html
@@ -58,6 +58,4 @@
     </div>
   </div>
 
-  <!-- <a href="#" class="r" target="_blank" title="Reddit Thread"><svg class="icon xl"><use xlink:href="#reddit"></use></svg></a> -->
-
 </header>
diff --git a/app/views/_modal.html b/app/views/_modal.html
diff --git a/app/views/_slot-hardpoint.html b/app/views/_slot-hardpoint.html
diff --git a/app/views/_slot-internal.html b/app/views/_slot-internal.html
@@ -9,6 +9,8 @@
   <div class="l" ng-if="c.c.bins">{{c.c.bins}} <u>Bins</u></div>
   <div class="l" ng-if="c.c.rate">Rate: {{$r.fRound4(c.c.rate/1000)}} <u>T/s</u></div>
   <div class="l" ng-if="c.c.ammo">Ammo: {{c.c.ammo}}</div>
+  <div class="l" ng-if="c.c.cells">Cells: {{c.c.cells}}</div>
+  <div class="l" ng-if="c.c.recharge">Recharge: {{c.c.recharge}} <u>Mj</u></div>
   <div class="l" ng-if="c.c.repair">Repair: {{c.c.repair}}</div>
   <div class="l" ng-if="c.c.range">{{c.c.range}} <u>KM</u></div>
   <div class="l" ng-if="c.c.rangeRating">Range: {{c.c.rangeRating}}</div>

diff --git a/app/views/modal-about.html b/app/views/modal-about.html
@@ -4,8 +4,13 @@ <h1><svg class="icon xl"><use xlink:href="#coriolis"></use></svg> <span class="w
 
 <p>Coriolis was created for non-commercial purposes. It is not endorsed by nor reflects the views or opinions of Frontier Developments.</p>
 
-<h2>Github</h2>
-<a href="https://github.com/cmmcleod/coriolis" target="_blank" title="Coriolis Github Project">github.com/cmmcleod/coriolis</a>
+<div>
+  <a class="l" style="margin: 0.4em" href="https://github.com/cmmcleod/coriolis" target="_blank" title="Coriolis Github Project">
+    <svg class="icon fg xl"><use xlink:href="#github-mark"></use></svg>
+  </a>
+  <h2>Github</h2>
+  <a href="https://github.com/cmmcleod/coriolis" target="_blank" title="Coriolis Github Project">github.com/cmmcleod/coriolis</a>
+</div>
 <p>
   Coriolis is an open source project. Checkout the list of upcoming features and to-do list on github.
   Any and all contributions and feedback are welcome. If you encounter any bugs please report them and provide as much detail as possible.

diff --git a/app/views/modal-delete.html b/app/views/modal-delete.html
diff --git a/app/views/modal-export.html b/app/views/modal-export.html
@@ -1,5 +1,5 @@
 <h2 ng-bind="title"></h2>
 <div>
-  <textarea class="cb json" ng-focus="onTextClick($event)" ng-bind="export"></textarea>
+  <textarea class="cb json" ng-click="onTextClick($event)" ng-bind="export"></textarea>
 </div>
 <button class="r dismiss" ng-click="dismiss()">Close</button>
diff --git a/app/views/modal-import.html b/app/views/modal-import.html
diff --git a/app/views/modal-link.html b/app/views/modal-link.html
@@ -1,9 +1,9 @@
 <h2>Permalink</h2>
 <br>
 <h3>URL</h3>
-<input ng-model="url" size="70" ng-focus="onTextClick($event)">
+<input ng-model="url" size="70" ng-click="onTextClick($event)">
 <br><br>
 <h3>Shortened</h3>
-<input ng-model="shortenedUrl" size="25" ng-focus="onTextClick($event)">
+<input ng-model="shortenedUrl" size="25" ng-click="onTextClick($event)">
 <br><br>
 <button class="r dismiss" ng-click="dismiss()">Close</button>
diff --git a/app/views/page-comparison.html b/app/views/page-comparison.html
@@ -48,7 +48,7 @@ <h3>Select Builds to Compare</h3>
       <table>
         <thead><tr><th colspan="2">Available</th></tr></thead>
         <tbody>
-          <tr ng-repeat="b in unusedBuilds | orderBy:'[0]'" ng-click="addBuild(b.id, b.buildName)">
+          <tr ng-repeat="b in unusedBuilds | orderBy:'name'" ng-click="addBuild(b.id, b.buildName)">
             <td class="tl" ng-bind="b.name"></td><td class="tl" ng-bind="b.buildName"></td>
           </tr>
         </tbody>

diff --git a/app/views/page-error.html b/app/views/page-error.html
-Original file line number
+Diff line change
@@ Expand Up / @@ -68,8 +68,4 @@ @@
         }
       }
-      &:nth-child(n+2) {
-        border-top: 1px solid @primary;
-      }
     }