added something :-)

This commit is contained in:
Ken Johnson
2013-04-25 01:24:59 -04:00
parent c75c0b20b3
commit 68acfe3803
5 changed files with 20 additions and 1 deletions
+1 -1
View File
@@ -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
@@ -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>
+6
View File
@@ -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"}%>