Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

  • Loading branch information...
commit 5b450aa8686507d5af95b1a6326c8d5f98d9e73a 1 parent 52a69e1
Jeffrey Warren authored
2  webserver/app/controllers/spectrums_controller.rb
View
@@ -80,7 +80,7 @@ def author
# non REST
def compare
@spectrum = Spectrum.find(params[:id])
- @spectrums = Spectrum.find(:all, :conditions => ['id != ? AND (title LIKE ? OR notes LIKE ?)',@spectrum.id,"%"+params[:q]+"%", "%"+params[:q]+"%"],:limit => 100,:order => "created_at DESC")
+ @spectrums = Spectrum.find(:all, :conditions => ['id != ? AND (title LIKE ? OR notes LIKE ?)',@spectrum.id,"%"+params[:q]+"%", "%"+params[:q]+"%"],:limit => 20,:order => "created_at DESC")
render :partial => "compare", :layout => false
end
4 webserver/app/views/layouts/mobile.html.erb
View
@@ -6,9 +6,7 @@
<title>SpectralWorkbench</title>
<link rel="stylesheet" href="/stylesheets/jquery.mobile-1.1.0.min.css" />
<link rel="stylesheet" href="/stylesheets/mobile.css" />
- <script src="/javascripts/getUserMedia.js"> </script>
<script src="/javascripts/jquery.min.js"> </script>
- <script src="/javascripts/capture.js"> </script>
<script>
$(document).bind("mobileinit", function(){
// disable ajax nav
@@ -21,6 +19,8 @@
<script language="javascript" type="text/javascript" src="/javascripts/flot/jquery.flot.js"></script>
<script language="javascript" type="text/javascript" src="/javascripts/flot/jquery.flot.crosshair.js"></script>
<%= javascript_include_tag "application" %>
+ <script src="/javascripts/getUserMedia.js"> </script>
+ <script src="/javascripts/capture.js"> </script>
</head>
<body>
<div id="fb-root"></div>
2  webserver/app/views/spectrums/index.mobile.erb
View
@@ -28,6 +28,8 @@ li.spectrum .text {
<div data-role="content" style="padding: 15px">
+ <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>
+
<h1>SpectralWorkbench</h1>
<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>
Please sign in to comment.
Something went wrong with that request. Please try again.