From d44ae6a69f122daa0be06858bb5fd949fa5d8cfd Mon Sep 17 00:00:00 2001
From: Will Bradley <bradley.will@gmail.com>
Date: Thu, 10 Jan 2013 23:11:41 -0700
Subject: [PATCH] Halfway done with adding new user fields

---
 app/models/user.rb             |  2 +-
 app/views/users/_form.html.erb | 40 ++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 3e8c50e..9c34875 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -6,7 +6,7 @@ class User < ActiveRecord::Base
          :recoverable, :rememberable, :trackable, :validatable
 
   # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation, :remember_me, :name, :admin, :active
+  attr_accessible :email, :password, :password_confirmation, :remember_me, :name, :admin, :active, :emergency_name, :emergency_phone, :current_skills, :desired_skills, :waiver, :emergency_email, :phone, :payment_method, :orientation, :member_level
 
   has_many :cards
 end
diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
index 3cca74b..f69137d 100644
--- a/app/views/users/_form.html.erb
+++ b/app/views/users/_form.html.erb
@@ -19,6 +19,46 @@
     <%= f.label :email %><br />
     <%= f.email_field :email %>
   </div>
+  <div class="field">
+    <%= f.label :waiver %><br />
+    <%= f.date_select :waiver %>
+  </div>
+  <div class="field">
+    <%= f.label :orientation %><br />
+    <%= f.date_select :orientation %>
+  </div>
+  <div class="field">
+    <%= f.label :emergency_name %><br />
+    <%= f.text_field :emergency_name %>
+  </div>
+  <div class="field">
+    <%= f.label :emergency_phone %><br />
+    <%= f.text_field :emergency_phone %>
+  </div>
+  <div class="field">
+    <%= f.label :emergency_email %><br />
+    <%= f.text_field :emergency_email %>
+  </div>
+  <div class="field">
+    <%= f.label :member_level %><br />
+    <%= f.text_field :member_level %>
+  </div>
+  <div class="field">
+    <%= f.label :payment_method %><br />
+    <%= f.text_field :payment_method %>
+  </div>
+  <div class="field">
+    <%= f.label :phone %><br />
+    <%= f.text_field :phone %>
+  </div>
+  <div class="field">
+    <%= f.label :current_skills %><br />
+    <%= f.text_area :current_skills %>
+  </div>
+  <div class="field">
+    <%= f.label :desired_skills %><br />
+    <%= f.text_area :desired_skills %>
+  </div>
   <% if @user.id.blank? || !params[:password].nil? %>
   <div class="field">
     <%= f.label :password %><br />