start/stop scripts for port 80, percentage based sampling height, fix…

…ed macros route

app/views/analyze/_tools.html.erb

@@ -9,6 +9,7 @@
     <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 onClick="$W.set_sample_row()" data-toggle="modal">Enter percentage sample height</a></li>
     <li><a href="/spectra/rotate/<%= @spectrum.id %>">Rotate image</a></li>
     <li><a href="/spectra/reverse/<%= @spectrum.id %>"><i class="icon icon-resize-horizontal"></i> Flip image horizontally</a></li>
     <li><a href="/spectra/find_brightest_row/<%= @spectrum.id %>">Auto-detect brightest spectrum</a></li>

config/routes.rb

@@ -81,6 +81,7 @@
   get '/macro/update/:id' => 'macros#update'
   get '/macro/:author/:id' => 'macros#show'
   get '/macro/:author/:id.:format' => 'macros#show'
+  get '/macros' => 'macros#index'
   get '/dashboard' => 'users#dashboard'
   get '/popular' => 'likes#index'
   get '/popular/recent' => 'likes#recent'

public/javascripts/show.js

@@ -291,10 +291,10 @@ $W = {
   },
 
   set_sample_row: function() {
-    var rownum = prompt('Enter the pixel row you would like to extract a spectrum from, where row 0 is the top edge of the original image.','100')
+    var rownum = prompt('Enter the percentage from the top edge from which you would like to extract a spectrum.','100')
     $("#imagelink")[0].onclick = ""
     $('#imagelink').tooltip('destroy')
-    if (rownum) window.location = '/spectrums/setsamplerow/'+$W.spectrum_id+'?row='+rownum
+    if (rownum) window.location = '/spectrums/setsamplerow/'+$W.spectrum_id+'?row='+rownum/100.00
   },
 
   click_to_set_sample_row: function() {

restart

@@ -1,2 +1,2 @@
-passenger stop -p 3000
-passenger start -a 127.0.0.1 -p 3000 -d -e production
+rvmsudo `which passenger` stop -p 80
+rvmsudo `which passenger` start -d -e production -p 80 --user=warren

startup

@@ -1 +1 @@
-passenger start -a 127.0.0.1 -p 3000 -d -e production
+rvmsudo `which passenger` start -d -e production -p 80 --user=warren

stop

@@ -1 +1 @@
-passenger stop -p 3000
+rvmsudo `which passenger` stop -p 80