Permalink
Browse files

cleanup and fixes

  • Loading branch information...
1 parent 986f5b7 commit f485cc9e73070ad3b18882f726a8ecd42bff0bfd @jywarren committed May 25, 2012
Showing with 2 additions and 89 deletions.
  1. +1 −0 .gitignore
  2. +0 −2 webserver/app/views/sessions/new.html.erb
  3. +1 −1 webserver/app/views/spectrums/assign.html.erb
  4. +0 −86 webserver/dump.sql
View
@@ -13,4 +13,5 @@ webserver/public/system*
webserver/config/initializers/recaptcha.rb
webserver/config/initializers/site_keys.rb
spectrometry_kit/spectra/*
+spectrometry_kit/data/settings.txt
spectrometry_kit/application.macosx/spectra/*
@@ -8,10 +8,8 @@
<p><%= label_tag 'login' %><br />
<%= text_field_tag 'login', @login %></p>
-<!-- Uncomment this if you want this functionality
<p><%= label_tag 'remember_me', 'Remember me' %>
<%= check_box_tag 'remember_me', '1', @remember_me %></p>
--->
<p><%= submit_tag 'Log in' %></p>
<% end -%>
@@ -31,5 +31,5 @@
</div>
<hr style="clear:both;"/>
<br />
- <a class="button" href="/spectra/claim/<%= params[:id] %>/?claim=true&<%= params[:author] %>">Assign these spectra to <%= params[:id] %></a>
+ <a class="button" href="/spectra/assign/<%= params[:id] %>/?claim=true&<%= params[:author] %>">Assign these spectra to <%= params[:id] %></a>
View

Large diffs are not rendered by default.

Oops, something went wrong.

0 comments on commit f485cc9

Please sign in to comment.