added something :-)
This commit is contained in:
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
class User < ActiveRecord::Base
|
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_confirmation_of :password, :password_confirmation
|
||||||
validates_presence_of :password, :on => :create
|
validates_presence_of :password, :on => :create
|
||||||
validates_presence_of :email
|
validates_presence_of :email
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
<a href="#l" class="logo">
|
<a href="#l" class="logo">
|
||||||
|
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<div class="user-profile">
|
<div class="user-profile">
|
||||||
<a data-toggle="dropdown" class="dropdown-toggle">
|
<a data-toggle="dropdown" class="dropdown-toggle">
|
||||||
<img src=" <%= image_path('profile_color.jpg')%>" alt="profile">
|
<img src=" <%= image_path('profile_color.jpg')%>" alt="profile">
|
||||||
@@ -20,6 +21,14 @@
|
|||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<ul class="mini-nav">
|
<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>
|
<li>
|
||||||
<a href="#">
|
<a href="#">
|
||||||
<div class="fs1" aria-hidden="true" data-icon=""></div>
|
<div class="fs1" aria-hidden="true" data-icon=""></div>
|
||||||
|
|||||||
@@ -16,6 +16,12 @@
|
|||||||
<%= f.label "Email Address" %>
|
<%= f.label "Email Address" %>
|
||||||
<%= f.text_field :email, {:class => "input input-block-level"} %>
|
<%= 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.label :password, nil %>
|
||||||
<%= f.password_field :password, {:class => "input input-block-level"}%>
|
<%= f.password_field :password, {:class => "input input-block-level"}%>
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,8 @@ class CreateUsers < ActiveRecord::Migration
|
|||||||
t.string :email
|
t.string :email
|
||||||
t.string :password
|
t.string :password
|
||||||
t.boolean :admin
|
t.boolean :admin
|
||||||
|
t.string :first_name
|
||||||
|
t.string :last_name
|
||||||
|
|
||||||
t.timestamps
|
t.timestamps
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -18,6 +18,8 @@ ActiveRecord::Schema.define(:version => 20130424220355) do
|
|||||||
t.string "password"
|
t.string "password"
|
||||||
t.string "user_id"
|
t.string "user_id"
|
||||||
t.boolean "admin"
|
t.boolean "admin"
|
||||||
|
t.string "first_name"
|
||||||
|
t.string "last_name"
|
||||||
t.datetime "created_at", :null => false
|
t.datetime "created_at", :null => false
|
||||||
t.datetime "updated_at", :null => false
|
t.datetime "updated_at", :null => false
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user