Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:jywarren/spectral-workbench

  • Loading branch information...
commit ccc8fd1e7caea32832297e010c55e776f8369d6c 2 parents 16e50c3 + 0088146
@jywarren authored
View
1  webserver/app/views/analyze/spectrum.html.erb
@@ -31,6 +31,7 @@
<a href="#embedmodal" class="btn btn-inverse hidden-phone" data-toggle="modal"><i class="icon icon-white icon-share"></i><span class="hidden-phone"> Embed</span></a>
<%= render :partial => "embed" %>
<a class="btn btn-inverse" href="javascript:void(0);" onClick="window.location = '/sets/add/'+prompt('Add to which set? (enter an id)')+'?spectrum_id=<%= @spectrum.id %>'"><i class="icon icon-white icon-plus-sign"></i><span class="hidden-phone"> Add to set</span></a>
+ <a class="btn btn-inverse hidden-phone" id="createSet" href="javascript:void(0);"><i class="icon icon-white icon-list"></i><span class="hidden-phone"> Save as set</span></a>
<a data-toggle="modal" class="btn btn-inverse" href="#comparemodal"><i class="icon icon-white icon-align-left"></i><span class="hidden-phone"> Compare</span></a>
<a rel="popover" data-placement="left" class="pull-right btn btn-inverse" data-content='<ul class="nav nav-list"><li><a onClick="$W.units()">Toggle units</a></li><li><a onClick="$W.toggle_mode()">Toggle RGB</a></li><li><a onClick="$W.extract()"><i class="icon icon-refresh"></i> Re-extract from photo</a></li><li><a href="#selectrowmodal" data-toggle="modal">Set sample row</a></li><li><a href="/spectra/rotate/<%= @spectrum.id %>">Rotate image</a></li><li><a href="/spectra/find_brightest_row/<%= @spectrum.id %>">Auto-detect brightest spectrum</a></li></ul>'><i class="icon icon-white icon-briefcase"></i><span class="hidden-phone"> More tools</span></a>
View
8 webserver/app/views/capture/index-mobile.html.erb
@@ -1,6 +1,7 @@
<div data-role="page" id="page1">
<div data-theme="d" data-role="header">
<a data-role="button" data-mini="true" data-theme="c" href="http://publiclaboratory.org/wiki/spectral-workbench-usage">Help</a>
+ <a style="float:left;" data-icon="gear" data-role="button" data-mini="true" data-theme="c" href="#settings">&nbsp;</a>
<h3>
<img src="/images/spectralworkbench.png" />
<a id="home" data-theme="b" href="/">SpectralWorkbench</a>
@@ -15,7 +16,6 @@
<div id="graph" style="width:100%;height:100px;"></div>
<br />
<canvas style="width:100%;height:100px;" id="canvas"></canvas>
- <div style="width:100%;display:none;" id="webcam"></div>
<span id="match"></span>
@@ -80,13 +80,15 @@
</div>
</div>
-<div data-role="page" id="page3">
+<div data-role="page" id="settings">
+ <div style="height:40%;" id="webcam"></div>
<div data-role="fieldcontain">
<fieldset data-role="controlgroup" data-mini="true">
- <label for="sample_slider">Range</label>
+ <label for="sample_slider">Choose where to sample:</label>
<input type="range" name="slider" id="sample_slider" value="250" min="0" max="640" data-highlight="false" />
</fieldset>
</div>
+ <a data-role="button" data-transition="fade" data-theme="d" href="#page1" onClick="$W.cancelSave()">&laquo; Back</a>
</div>
<script> (function () {
View
2  webserver/app/views/users/dashboard.html.erb
@@ -5,7 +5,7 @@
<% if logged_in? && !flash[:notice] && !flash[:error] && !flash[:warning] && !mobile? %>
<% if current_user.spectra.length < 3 %>
- <div class="alert alert"><button type="button" class="close" data-dismiss="alert">×</button>Join other open source spectrometry experimenters on the <a href="http://publiclaboratory.org/user/register">plots-spectrometry mailing list</a>.</a></div>
+ <div class="alert error"><button type="button" class="close" data-dismiss="alert">×</button><b>Warning:</b> due to an error in the printed instructions, the webcam of your Desktop Spectrometry Kit may need to be refocused. <a href="http://publiclaboratory.org/wiki/spectral-workbench-help#the-spectrum-image-is-blurry-no-sharp-peaks">Read more &raquo;</a></div>
<% elsif current_user.spectra.length >= 3 %>
<div class="alert alert"><button type="button" class="close" data-dismiss="alert">×</button><a href="http://publiclaboratory.org">Share your research</a> and reach out to collaborators at <a href="http://publiclaboratory.org">PublicLaboratory.org</a>.</a></div>
<% end %>
Please sign in to comment.
Something went wrong with that request. Please try again.