Both old and new-capture work along with cross-browser support

app/assets/config/manifest.js

@@ -2,6 +2,14 @@
 //= link application.css
 //= link application.js
 //= link capture.css
+//= link new-capture.css
 //= link capture.js
 //= link analyze.js
-//= link upload.js
+//= link upload.js
+//= link jquery.flot.js
+//= link jquery.flot.crosshair.js
+//= link jquery.flot.threshold.js
+//= link d3.js
+//= link nv.d3.js
+//= link nv.d3.min.css
+//= link api.js

app/assets/javascripts/application.js

@@ -12,15 +12,12 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require bootstrap-css/js/bootstrap.min.js
-//= require getusermedia.js/dist/getUserMedia.min.js
+//= require jquery-steps.js
+//= require bootstrap.min.js
 //= require basics.js
 //= require api.js
 //= require comment.js
-//= require flot/jquery.flot.js
-//= require flot/jquery.flot.crosshair.js
-//= require flot/jquery.flot.threshold.js
-//= require d3/d3.js
-//= require nvd3/build/nv.d3.js
-//= require moment/moment.js
-//= require spectral-workbench/dist/spectral-workbench.js
+//= require moment.js
+//= require d3.js
+//= require nv.d3.js
+//= require spectral-workbench.js

app/assets/stylesheets/application.css

@@ -8,12 +8,14 @@
  * You're free to add application-wide styles to this file and they'll appear at the top of the
  * compiled file, but it's generally better to create a new file per style scope.
  *
- *= require bootstrap-css/css/bootstrap.min.css
- *= require bootstrap-css/css/bootstrap-responsive.min.css
- *= require nvd3/build/nv.d3.css
+ *= require bootstrap.min.css
+ *= require bootstrap-responsive.min.css
+ *= require nv.d3.min.css
  *= require style
  *= require graph
  *= require comment
+ *= require spectral-workbench
+ *= require font-awesome
  *
  *= require_self
  *  require_tree .

app/views/capture/index.html.erb

@@ -1,3 +1,12 @@
+<%= javascript_include_tag "jquery.flot" %>
+<%= javascript_include_tag "jquery.flot.crosshair" %>
+<%= javascript_include_tag "jquery.flot.threshold" %>
+<%= javascript_include_tag "d3" %>
+<%= javascript_include_tag "nv.d3" %>
+
+
+<script src="https://cdn.temasys.io/adapterjs/0.15.x/adapter.min.js"></script>
+
 <% unless logged_in? %>
 <div class="modal fade hide" id="login-prompt-modal">
   <div class="modal-header">
@@ -7,10 +16,10 @@
   <div class="modal-body">
     <p>You can use this with some limitations without logging in, but once you set up an account, you'll be able to:</p>
     <ul>
-      <li>save and share data</li>
-      <li>calibrate and process your data</li>
-      <li>use this interface offline -- <a href="http://publiclab.org/wiki/spectral-workbench-usage#Offline">without an internet connection</a></li>
-      <li>contribute to a growing open source database</li>
+      <li>Save and share data</li>
+      <li>Calibrate and process your data</li>
+      <li>Use this interface offline - <a href="http://publiclab.org/wiki/spectral-workbench-usage#Offline">without an internet connection</a></li>
+      <li>Contribute to a growing open source database</li>
     </ul>
   </div>
   <div class="modal-footer">
@@ -68,15 +77,21 @@
 
   <script>
     jQuery(document).ready(function() {
+
       $W.setSampleRowClickListener()
 
       <% if ios? || (mobile? && !opera?) %>
         $W.toggle_rotation();
       <% end %>
 
     })
+
+  // <%= javascript_include_tag "application" %>
+
   </script>
 
+
+
   <p style="padding-top:5px;">
     <a rel="tooltip" title="" class="btn btn-inverse" onclick="$W.auto_detect_sample_row()" data-original-title="Auto select sample row"><i class="fa fa-white fa-arrows-v"></i> Auto-select Sample Row</a>
     <a rel="tooltip" title="Flip video horizontally" class="btn btn-inverse btn-flip" onClick="$W.flip_horizontal()"><i class="fa fa-white fa-arrows-h"></i> Flip image</a>