<%= f.label :name %>
+ <%= f.text_field :name %>
<%= f.label :email %>
<%= f.text_field :email %>
<%= f.label :identity_url %>
- <%= f.text_field :identity_url %>
<%= f.label :name %>
+ <%= f.text_field :name %>
<%= f.label :email %>
<%= f.text_field :email %>
<%= f.label :identity_url %>
- <%= f.text_field :identity_url %>
<%= f.label :email %>
<%= f.text_field :email %>
<%= f.submit "Sign in" %>
<% end %> -<%= render :partial => "devise/shared/links" %> +<%= render :partial => "devise/shared/links" %> \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 2f3e650..3632057 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -12,7 +12,7 @@ <%= render 'devise/menu/registration_items' %> <%= render 'devise/menu/login_items' %> -<%= notice %>
<%= alert %>
diff --git a/config/application.rb b/config/application.rb index fefafae..893d885 100644 --- a/config/application.rb +++ b/config/application.rb @@ -39,6 +39,5 @@ class Application < Rails::Application # Configure sensitive parameters which will be filtered from the log file. config.filter_parameters += [:password, :password_confirmation] - config.middleware.insert_before(Warden::Manager, Rack::OpenID) end end diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 7746356..06af1d5 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -46,7 +46,7 @@ config.encryptor = :bcrypt # Setup a pepper to generate the encrypted password. - config.pepper = "4dda21a3b0da60adda7a8d0fa3a98e120618443e3e03ee3699823f20a395c6afb38027edf5bdfbc85810c3a005bec9c91368beb25c4c2bb6295e1af7540b9c69" + config.pepper = "44d61859aad32afab93602ac0cdc1f2527332d0782a9b0d91e75ace2a6b54177cdf2f3775d2f58575f80e04ea213f6f337bc36669c50d11d49bc852213d6a0a2" # ==> Configuration for :confirmable # The time you want to give your user to confirm his account. During this time diff --git a/config/routes.rb b/config/routes.rb index 4f343fa..72b3c9d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,6 +4,7 @@ resources :characters devise_for :users + resources :users, :only => [:index, :show] # The priority is based upon order of creation: # first created -> highest priority. diff --git a/db/migrate/20100820221903_devise_create_users.rb b/db/migrate/20100820221903_devise_create_users.rb deleted file mode 100644 index 9c58450..0000000 --- a/db/migrate/20100820221903_devise_create_users.rb +++ /dev/null @@ -1,27 +0,0 @@ -class DeviseCreateUsers < ActiveRecord::Migration - def self.up - create_table(:users) do |t| - t.database_authenticatable :null => false - t.recoverable - t.rememberable - t.trackable - t.openid_authenticatable - t.confirmable - t.lockable :lock_strategy => :failed_attempts, :unlock_strategy => :both - t.token_authenticatable - - t.timestamps - end - - add_index :users, :email, :unique => true - add_index :users, :reset_password_token, :unique => true - add_index :users, :confirmation_token, :unique => true - add_index :users, :unlock_token, :unique => true - add_index :users, :identity_url, :unique => true - end - - def self.down - drop_table :users - end - -end diff --git a/db/migrate/20100821001441_create_characters.rb b/db/migrate/20100821001441_create_characters.rb deleted file mode 100644 index 3a54567..0000000 --- a/db/migrate/20100821001441_create_characters.rb +++ /dev/null @@ -1,20 +0,0 @@ -class CreateCharacters < ActiveRecord::Migration - def self.up - create_table :characters do |t| - t.references :user - t.string :name - t.integer :str - t.integer :dex - t.integer :con - t.integer :int - t.integer :wis - t.integer :cha - - t.timestamps - end - end - - def self.down - drop_table :characters - end -end diff --git a/db/schema.rb b/db/schema.rb index d8eb7bc..c2b6a51 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20100821001441) do +ActiveRecord::Schema.define(:version => 20101104191045) do create_table "characters", :force => true do |t| t.integer "user_id" @@ -29,6 +29,7 @@ t.string "email", :default => "", :null => false t.string "encrypted_password", :limit => 128, :default => "", :null => false t.string "password_salt", :default => "", :null => false + t.string "name", :limit => 40 t.string "reset_password_token" t.string "remember_token" t.datetime "remember_created_at" @@ -37,13 +38,9 @@ t.datetime "last_sign_in_at" t.string "current_sign_in_ip" t.string "last_sign_in_ip" - t.string "identity_url" t.string "confirmation_token" t.datetime "confirmed_at" t.datetime "confirmation_sent_at" - t.integer "failed_attempts", :default => 0 - t.string "unlock_token" - t.datetime "locked_at" t.string "authentication_token" t.datetime "created_at" t.datetime "updated_at" @@ -51,8 +48,6 @@ add_index "users", ["confirmation_token"], :name => "index_users_on_confirmation_token", :unique => true add_index "users", ["email"], :name => "index_users_on_email", :unique => true - add_index "users", ["identity_url"], :name => "index_users_on_identity_url", :unique => true add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true - add_index "users", ["unlock_token"], :name => "index_users_on_unlock_token", :unique => true end diff --git a/public/stylesheets/site.css b/public/stylesheets/site.css index 6f9223d..4989807 100644 --- a/public/stylesheets/site.css +++ b/public/stylesheets/site.css @@ -7,6 +7,18 @@ border-bottom: solid 1px #000; } +#header a { + text-decoration:none; +} + +#header a, +#header a:link, +#header a:visited, +#header a:hover { + color:#000000; + background:none; +} + #title { font-size: 3em; font-family:serif;