From a425c4c91b9adcf3278717779dfc35d5b6ae0c16 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Thu, 6 Oct 2016 15:36:02 -0400
Subject: various fixes

Former-commit-id: 65da1a95c353a401b6ca13798916db77173b72a2
---
 www/index.html | 115 ++++++++++++++++-----------------------------------------
 1 file changed, 31 insertions(+), 84 deletions(-)

(limited to 'www/index.html')

diff --git a/www/index.html b/www/index.html
index 3cbdbca0..df6cdf13 100644
--- a/www/index.html
+++ b/www/index.html
@@ -9,80 +9,72 @@
 
     <meta http-equiv="Content-Security-Policy" content="img-src * 'self' data:; default-src * 'self' gap: ; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; ">
 
-    <!--<meta http-equiv="Content-Security-Policy" content="img-src * 'self' data:; default-src * gap:; style-src 'self' 'unsafe-inline'; script-src 'self' https://www.google.com 'unsafe-inline' 'unsafe-eval'; ">-->
-    <title></title>
+        <title></title>
     <meta name="format-detection" content="telephone=no">
 
-
-
-
     <link rel="stylesheet" href="css/animate.min.css">
-    <!-- <link rel="stylesheet" href="css/angular-circular-navigation.css">-->
-
     <link rel="stylesheet" href="css/angular-circular-navigation.css">
     <link rel="stylesheet" href="css/custommfb.css">
     <link rel="stylesheet" href="lib/font-awesome/css/font-awesome.min.css">
     <link rel="stylesheet" href="css/angular-carousel.css">
     <link rel="stylesheet" href="lib/angular-awesome-slider/dist/css/angular-awesome-slider.min.css">
     <link rel="stylesheet" href="lib/vis/dist/vis.min.css">
-
-    <link rel="stylesheet" href="external/ionic.content.banner.min.css">
-
-    <!--<link rel="stylesheet" href="external/ionic.content.banner.css">-->
-    <link rel="stylesheet" href="external/radio.css">
     <link rel="stylesheet" href="lib/ion-datetime-picker/release/ion-datetime-picker.min.css">
     <link rel="stylesheet" href="lib/angular-wizard/dist/angular-wizard.min.css">
-
-
     <link href="css/ionic.app.min.css" rel="stylesheet">
     <link href="css/style.css" rel="stylesheet">
 
-
+    <!-- unmanaged externals -->
+    <link rel="stylesheet" href="external/ionic.content.banner.min.css">
+    <link rel="stylesheet" href="external/radio.css">
 
 
 
     <script src="lib/ionic/js/ionic.bundle.min.js"></script>
-
-    <script src="external/angular-ios9-uiwebview.patch.js"></script>
-    <script src="external/ionRadio.js"></script>
-
     <script src="lib/ngCordova/dist/ng-cordova.min.js"></script>
     <script src="lib/filelogger/dist/filelogger.min.js"></script>
-    <!--<script src="external/angular-cookies.min.js"></script>-->
-
-    <!-- cordova script (this will be a 404 during development) -->
     <script src="cordova.js"></script>
     <script src="lib/localforage/dist/localforage.js"></script>
     <script src="lib/localforage-cordovasqlitedriver/dist/localforage-cordovasqlitedriver.js"></script>
-
-
     <script src="js/ionicUtils.js"></script>
     <script src="lib/ionic-native-transitions/dist/ionic-native-transitions.min.js"></script>
     <script src="lib/angular-wizard/dist/angular-wizard.min.js"></script>
     <script src="lib/crypto-js/crypto-js.js"></script>
-
-
-    <!-- your app's js -->
-
-    <!-- files in external/ are 3rd party libraries I modified. The better way is to fork
-    and make your mods. I'll get to that eventually -->
-
-
-
-
     <script src="lib/angular-awesome-slider/dist/angular-awesome-slider.min.js">
     </script>
-
-
     <script src="lib/videogular/videogular.js"></script>
     <script src="lib/videogular-controls/vg-controls.js"></script>
     <script src="lib/videogular-overlay-play/vg-overlay-play.js"></script>
     <script src="lib/videogular-buffering/vg-buffering.js"></script>
+    <script src="lib/ion-datetime-picker/release/ion-datetime-picker.min.js"></script>
+    <script src="lib/angular-translate/angular-translate.min.js"></script>
+    <script src="lib/angular-translate-loader-static-files/angular-translate-loader-static-files.min.js"></script>
+    <script src="lib/vis/dist/vis.min.js"></script>
+    <script src="lib/moment/min/moment-with-locales.min.js"></script>
+    <script src="lib/ng-mfb/src/mfb-directive.js"></script>
+    <script src="lib/angular-touch/angular-touch.js"></script>
 
+    <!-- unmanaged externals -->
+    <script src="external/angular-ios9-uiwebview.patch.js"></script>
+    <script src="external/ionRadio.js"></script>
+    <script src="external/ng-websocket.js"></script>
+    <script src="external/uri.min.js"></script>
+    <script src="external/angular-carousel.js"></script>
+    <script src="external/ion-pullup.js"></script>
+    <script src="external/ionic.content.banner.js"></script>
+    <script src="external/FileSaver.min.js"></script>
+    <script src="external/canvas-toBlob.js"></script>
+    <script src="external/imagesloaded.pkgd.js"></script>
+    <script src="external/packery.pkgd.js"></script>
+    <script src="external/draggabilly.pkgd.js"></script>
+    <script src="external/ionic.scroll.sista.js"></script>
+    <script src="external/angular-circular-navigation.js"></script>
+    
+    
 
 
+  <!-- app related JS -->
     <script src="js/app.js"></script>
-    <!--<script src="js/ExceptionHandler.js"></script>-->
     <script src="js/controllers.js"></script>
     <script src="js/DataModel.js"></script>
     <script src="js/LoginCtrl.js"></script>
@@ -104,58 +96,13 @@
     <script src="js/EventServer.js"></script>
     <script src="js/EventServerSettingsCtrl.js"></script>
     <script src="js/FirstUseCtrl.js"></script>
-    <script src="js/MontageHistoryCtrl2.js"></script>
+    <script src="js/MontageHistoryCtrl.js"></script>
     <script src="js/NewsCtrl.js"></script>
     <script src="js/TimelineModalCtrl.js"></script>
     <script src="js/WizardCtrl.js"></script>
     <script src="js/MenuController.js"></script>
-
-    <script src="lib/ion-datetime-picker/release/ion-datetime-picker.min.js"></script>
     <script src="js/EventsModalGraphCtrl.js"></script>
-
-    <script src="lib/angular-translate/angular-translate.min.js"></script>
-
-    <script src="lib/angular-translate-loader-static-files/angular-translate-loader-static-files.min.js"></script>
-
-    <!--<script src="lib/angular-cookies/angular-cookies.min.js"></script>
-    <script src="lib/angular-translate-storage-cookie/angular-translate-storage-cookie.min.js"></script>
-    <script src="lib/angular-translate-storage-local/angular-translate-storage-local.min.js"></script>-->
-
-
-
-    <script src="external/ng-websocket.js"></script>
-    <script src="external/uri.min.js"></script>
-
-
-
-    <script src="lib/vis/dist/vis.js"></script>
-
-    <!-- <script src="external/ionic.content.banner.js"></script>-->
-    <script src="external/angular-circular-navigation.js"></script>
-    <!--<script src="lib/Chart.js/Chart.min.js"></script>-->
-    <script src="lib/moment/min/moment-with-locales.min.js"></script>
-    <script src="external/Chart2.min.js"></script>
-    <script src="lib/tc-angular-chartjs/dist/tc-angular-chartjs.min.js"></script>
-    <script src="lib/ng-mfb/src/mfb-directive.js"></script>
-
-    <script src="lib/angular-touch/angular-touch.js"></script>
-    <script src="external/angular-carousel.js"></script>
-    <script src="external/ion-pullup.js"></script>
-    <script src="external/ionic.content.banner.js"></script>
-    <script src="external/FileSaver.min.js"></script>
-    <script src="external/canvas-toBlob.js"></script>
-
-
-    <script src="external/imagesloaded.pkgd.js"></script>
-    <script src="external/packery.pkgd.js"></script>
-    <script src="external/draggabilly.pkgd.js"></script>
-
-    <script src="external/ionic.scroll.sista.js"></script>
-
-    <!-- <script src="external/imagesloaded.pkgd.js"></script>-->
-
-
-
+   
 
 
 </head>
-- 
cgit v1.2.3