From 6523e8e3356957b3e1a0eea256476df601eb977b Mon Sep 17 00:00:00 2001
From: Nicolae Claudius <nicolae_claudius@yahoo.com>
Date: Wed, 7 Mar 2012 12:20:26 -0800
Subject: [PATCH] nested interval 0.0.2, reset email form glitch

---
 Gemfile                                  |  2 +-
 Gemfile.lock                             | 14 +++++---------
 app/views/devise/passwords/edit.html.erb |  4 ++--
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index 8d18595..17cc13d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,7 +26,7 @@ gem 'simple_form', '~> 2.0.0'
 gem 'concerned_with', '~> 0.1.0'
 gem 'navigasmic', '~> 0.5.6', git: 'https://github.com/jejacks0n/navigasmic.git'
 gem 'rails-backbone', '~> 0.7.0'
-gem 'acts_as_nested_interval', '~> 0.0.1'
+gem 'acts_as_nested_interval', '~> 0.0.2'
 # path: '/home/clyfe/dev/acts_as_nested_interval'
 # git: 'https://github.com/clyfe/acts_as_nested_interval.git'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 03a0584..be75834 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -23,12 +23,6 @@ PATH
     active_scaffold (3.2.0)
       rails (>= 3.1.3)
 
-PATH
-  remote: /home/clyfe/dev/acts_as_nested_interval
-  specs:
-    acts_as_nested_interval (0.0.1)
-      rails (~> 3.2.1)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -62,6 +56,8 @@ GEM
     activesupport (3.2.2)
       i18n (~> 0.6)
       multi_json (~> 1.0)
+    acts_as_nested_interval (0.0.2)
+      rails (~> 3.2.1)
     arel (3.0.2)
     bcrypt-ruby (3.0.1)
     bootstrap-sass-rails (2.0.0.3)
@@ -126,7 +122,7 @@ GEM
       tins (~> 0.3)
     fssm (0.2.8.1)
     gem_plugin (0.2.3)
-    guard (1.0.0)
+    guard (1.0.1)
       ffi (>= 0.5.0)
       thor (~> 0.14.6)
     guard-rspec (0.6.0)
@@ -144,7 +140,7 @@ GEM
     json (1.6.5)
     libnotify (0.7.2)
     libv8 (3.3.10.4)
-    mail (2.4.1)
+    mail (2.4.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
@@ -281,7 +277,7 @@ PLATFORMS
 DEPENDENCIES
   active-model-email-validator (~> 1.0.2)
   active_scaffold (~> 3.2.0)!
-  acts_as_nested_interval (~> 0.0.1)!
+  acts_as_nested_interval (~> 0.0.2)
   bootstrap-sass-rails (~> 2.0.0.2)
   cancan (~> 1.6.7)
   capistrano (~> 2.9.0)
diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb
index accfd36..c72e0a5 100644
--- a/app/views/devise/passwords/edit.html.erb
+++ b/app/views/devise/passwords/edit.html.erb
@@ -7,13 +7,13 @@
     url: password_path(resource_name),
     html: { method: :put, class: 'form-horizontal' }
   ) do |f| %>
+  <%= f.hidden_field :reset_password_token %>
   
   <%= devise_error_messages! %>
   
   <div class="inputs">
-    <%= f.hidden_field :reset_password_token %>
     <%= f.input :password, label: "New password" %>
-    <%= f.password_field :password_confirmation, label: "Confirm new password" %></div>
+    <%= f.input :password_confirmation, label: "Confirm new password" %>
   </div>
   
   <div class="form-actions">