Skip to content
This repository
Browse code

mobile tweaks, attempts to fix #138 and warning related to that

  • Loading branch information...
commit 5b450aa8686507d5af95b1a6326c8d5f98d9e73a 1 parent 52a69e1
Jeffrey Warren authored October 22, 2012
2  webserver/app/controllers/spectrums_controller.rb
@@ -80,7 +80,7 @@ def author
80 80
   # non REST
81 81
   def compare
82 82
     @spectrum = Spectrum.find(params[:id])
83  
-    @spectrums = Spectrum.find(:all, :conditions => ['id != ? AND (title LIKE ? OR notes LIKE ?)',@spectrum.id,"%"+params[:q]+"%", "%"+params[:q]+"%"],:limit => 100,:order => "created_at DESC")
  83
+    @spectrums = Spectrum.find(:all, :conditions => ['id != ? AND (title LIKE ? OR notes LIKE ?)',@spectrum.id,"%"+params[:q]+"%", "%"+params[:q]+"%"],:limit => 20,:order => "created_at DESC")
84 84
     render :partial => "compare", :layout => false
85 85
   end
86 86
 
4  webserver/app/views/layouts/mobile.html.erb
@@ -6,9 +6,7 @@
6 6
         <title>SpectralWorkbench</title>
7 7
         <link rel="stylesheet" href="/stylesheets/jquery.mobile-1.1.0.min.css" />
8 8
         <link rel="stylesheet" href="/stylesheets/mobile.css" />
9  
-	<script src="/javascripts/getUserMedia.js"> </script>
10 9
         <script src="/javascripts/jquery.min.js"> </script>
11  
-	<script src="/javascripts/capture.js"> </script>
12 10
         <script>
13 11
           $(document).bind("mobileinit", function(){
14 12
             // disable ajax nav
@@ -21,6 +19,8 @@
21 19
 	<script language="javascript" type="text/javascript" src="/javascripts/flot/jquery.flot.js"></script> 
22 20
 	<script language="javascript" type="text/javascript" src="/javascripts/flot/jquery.flot.crosshair.js"></script>
23 21
 	<%= javascript_include_tag "application" %>
  22
+	<script src="/javascripts/getUserMedia.js"> </script>
  23
+	<script src="/javascripts/capture.js"> </script>
24 24
     </head>
25 25
     <body>
26 26
 <div id="fb-root"></div>
2  webserver/app/views/spectrums/index.mobile.erb
@@ -28,6 +28,8 @@ li.spectrum .text {
28 28
 
29 29
 	<div data-role="content" style="padding: 15px">
30 30
 
  31
+	<p style="background:#fcc;padding:8px;" class="notice"><b>Warning: The latest Opera Mobile has a bug which breaks mobile capture. <a href="http://publiclaboratory.org/wiki/opera-mobile">Download the previous version</a>.</p>
  32
+
31 33
 	<h1>SpectralWorkbench</h1>
32 34
 
33 35
 	<p><i>Affordable, DIY, open source spectral analysis from your desktop or Android phone (<a href="javascript:void();" onClick="$('#readmore').toggle()">Read more</a>)</i></p>

0 notes on commit 5b450aa

Please sign in to comment.
Something went wrong with that request. Please try again.