From 68acfe38036b74204f8c759de0493fd9909d3cc1 Mon Sep 17 00:00:00 2001
From: Ken Johnson <cktricky@Kens-MacBook-Pro.local>
Date: Thu, 25 Apr 2013 01:24:59 -0400
Subject: [PATCH] added something :-)

---
 app/models/user.rb                        | 2 +-
 app/views/layouts/shared/_header.html.erb | 9 +++++++++
 app/views/users/new.html.erb              | 6 ++++++
 db/migrate/20130424220355_create_users.rb | 2 ++
 db/schema.rb                              | 2 ++
 5 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 5b29eac..3f0dd87 100755
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,5 +1,5 @@
 class User < ActiveRecord::Base
-  attr_accessible :email, :password, :user_id, :admin, :password_confirmation
+  attr_accessible :email, :password, :user_id, :admin, :password_confirmation, :first_name, :last_name
   validates_confirmation_of :password, :password_confirmation
   validates_presence_of :password, :on => :create
   validates_presence_of :email
diff --git a/app/views/layouts/shared/_header.html.erb b/app/views/layouts/shared/_header.html.erb
index 8864c07..5260491 100755
--- a/app/views/layouts/shared/_header.html.erb
+++ b/app/views/layouts/shared/_header.html.erb
@@ -2,6 +2,7 @@
      <a href="#l" class="logo">
       
      </a>
+
      <div class="user-profile">
        <a data-toggle="dropdown" class="dropdown-toggle">
          <img src=" <%= image_path('profile_color.jpg')%>"  alt="profile">
@@ -20,6 +21,14 @@
        </ul>
      </div>
      <ul class="mini-nav">
+	   <li style="color: #FFFFFF">
+		<!-- 
+		I'm going to use HTML safe because we had some weird stuff
+		going on with funny chars and jquery, plus it says safe so I'm guessing
+		nothing bad will happen
+		-->
+		Welcome, <%= current_user.first_name.html_safe %>
+	   </li>
        <li>
          <a href="#">
            <div class="fs1" aria-hidden="true" data-icon="&#xe040;"></div>
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 0188314..2232965 100755
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -15,6 +15,12 @@
 					<div class="content">
 				    		<%= f.label "Email Address" %>
 				    		<%= f.text_field :email, {:class => "input input-block-level"} %>
+				
+							<%= f.label "First Name" %>
+				    		<%= f.text_field :first_name, {:class => "input input-block-level"} %>
+				
+							<%= f.label "Last Name" %>
+				    		<%= f.text_field :last_name, {:class => "input input-block-level"} %>
 				  
 				    		<%= f.label :password, nil %>
 				    		<%= f.password_field :password, {:class => "input input-block-level"}%>
diff --git a/db/migrate/20130424220355_create_users.rb b/db/migrate/20130424220355_create_users.rb
index 08bfde9..1a9cf2c 100755
--- a/db/migrate/20130424220355_create_users.rb
+++ b/db/migrate/20130424220355_create_users.rb
@@ -4,6 +4,8 @@ class CreateUsers < ActiveRecord::Migration
       t.string :email
       t.string :password
       t.boolean :admin
+      t.string :first_name
+      t.string :last_name
 
       t.timestamps
     end
diff --git a/db/schema.rb b/db/schema.rb
index 53c923c..8281efe 100755
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -18,6 +18,8 @@ ActiveRecord::Schema.define(:version => 20130424220355) do
     t.string   "password"
     t.string   "user_id"
     t.boolean  "admin"
+    t.string   "first_name"
+    t.string   "last_name"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
   end