diff --git a/Gemfile b/Gemfile index c3ccbb0..063f3ad 100644 --- a/Gemfile +++ b/Gemfile @@ -44,7 +44,7 @@ gem 'active_scaffold', '~> 3.4.0.rc', gem 'turbolinks', '~> 1.3.0' gem 'faker','~> 1.2.0' gem 'factory_girl_rails', '~> 4.3.0' -# gem 'rails_admin', '~> 0.5.0' +gem 'rails_admin', '~> 0.6.0' # gem 'jquery-cookie-rails', '~> 1.3.1' # gem 'foreigner', '~> 1.4.2 @@ -53,6 +53,8 @@ group :development do gem 'better_errors', '1.0.1' gem 'binding_of_caller', '0.7.2' gem 'debase', '~> 0.0.7' + gem 'bullet', '~> 4.7.1' + gem 'letter_opener', '~> 1.1.2' # gem 'byebug', '~> 2.3.1' # gem 'ruby-debug-ide', '~> 0.4.18' # gem 'mongrel', '>= 1.2.0.pre2' diff --git a/Gemfile.lock b/Gemfile.lock index 4c70e80..f54fd5b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -58,6 +58,7 @@ GEM tzinfo (~> 0.3.37) acts_as_nested_interval (0.1.0) rails (>= 3.2.1, < 5) + addressable (2.3.5) animate-rails (1.0.3) rails arel (4.0.1) @@ -71,6 +72,9 @@ GEM bootstrap-sass (3.0.2.1) sass (~> 3.2) builder (3.1.4) + bullet (4.7.1) + activesupport + uniform_notifier (>= 1.4.0) cancan (1.6.7) capybara (2.1.0) mime-types (>= 1.16) @@ -117,7 +121,11 @@ GEM railties (>= 3.0.0) faker (1.2.0) i18n (~> 0.5) + font-awesome-rails (4.0.3.0) + railties (>= 3.2, < 5.0) fssm (0.2.10) + haml (4.0.4) + tilt hike (1.2.3) i18n (0.6.5) jquery-rails (3.0.4) @@ -126,7 +134,14 @@ GEM jquery-ui-rails (4.1.0) railties (>= 3.1.0) json (1.8.1) + kaminari (0.15.0) + actionpack (>= 3.0.0) + activesupport (>= 3.0.0) kgio (2.8.1) + launchy (2.4.0) + addressable (~> 2.3) + letter_opener (1.1.2) + launchy (~> 2.2) libv8 (3.16.14.3) mail (2.5.4) mime-types (~> 1.16) @@ -139,6 +154,7 @@ GEM minitest (4.7.5) multi_json (1.8.2) mysql2 (0.3.14) + nested_form (0.3.2) nilify_blanks (1.0.2) activerecord (>= 3.0.0) activesupport (>= 3.0.0) @@ -154,6 +170,9 @@ GEM quiet_assets (1.0.2) railties (>= 3.1, < 5.0) rack (1.5.2) + rack-pjax (0.7.0) + nokogiri (~> 1.5) + rack (~> 1.3) rack-test (0.6.2) rack (>= 1.0) rails (4.0.1) @@ -166,6 +185,20 @@ GEM sprockets-rails (~> 2.0.0) rails-settings-cached (0.3.2) rails (>= 4.0.0) + rails_admin (0.6.0) + builder (~> 3.1) + coffee-rails (~> 4.0) + font-awesome-rails (>= 3.0) + haml (~> 4.0) + jquery-rails (~> 3.0) + jquery-ui-rails (~> 4.0) + kaminari (~> 0.14) + nested_form (~> 0.3) + rack-pjax (~> 0.7) + rails (~> 4.0.0) + remotipart (~> 1.0) + safe_yaml (~> 0.9) + sass-rails (~> 4.0) rails_config (0.3.3) activesupport (>= 3.0) railties (4.0.1) @@ -176,6 +209,7 @@ GEM raindrops (0.12.0) rake (10.1.0) ref (1.0.5) + remotipart (1.2.1) rspec-core (2.14.7) rspec-expectations (2.14.4) diff-lcs (>= 1.1.3, < 2.0) @@ -187,6 +221,7 @@ GEM rspec-core (~> 2.14.0) rspec-expectations (~> 2.14.0) rspec-mocks (~> 2.14.0) + safe_yaml (0.9.7) sass (3.2.12) sass-rails (4.0.1) railties (>= 4.0.0, < 5.0) @@ -232,6 +267,7 @@ GEM kgio (~> 2.6) rack raindrops (~> 0.7) + uniform_notifier (1.4.0) warden (1.2.3) rack (>= 1.0) webshims-rails (1.11.3.1) @@ -250,6 +286,7 @@ DEPENDENCIES better_errors (= 1.0.1) binding_of_caller (= 0.7.2) bootstrap-sass (~> 3.0.2.1) + bullet (~> 4.7.1) cancan (= 1.6.7) capybara (~> 2.1.0) coffee-rails (~> 4.0.0) @@ -265,6 +302,7 @@ DEPENDENCIES jquery-rails (~> 3.0.4) jquery-ui-rails (~> 4.1.0) json (~> 1.8.0) + letter_opener (~> 1.1.2) mail_form (~> 1.5.0) mysql2 (~> 0.3.13) navigasmic (~> 0.5.6)! @@ -274,6 +312,7 @@ DEPENDENCIES quiet_assets (~> 1.0.1) rails (= 4.0.1) rails-settings-cached (~> 0.3.1) + rails_admin (~> 0.6.0) rails_config (~> 0.3.3) rspec-rails (~> 2.14.0) sass-rails (~> 4.0.0) diff --git a/app/assets/stylesheets/pages/home.css.scss b/app/assets/stylesheets/pages/home.css.scss index 9065b03..56b8952 100644 --- a/app/assets/stylesheets/pages/home.css.scss +++ b/app/assets/stylesheets/pages/home.css.scss @@ -39,6 +39,3 @@ } } -.public .alert { - margin-bottom: 0; -} diff --git a/config/environments/development.rb b/config/environments/development.rb index d8a85a9..dc2c925 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -24,12 +24,25 @@ Entrydns::Application.configure do # Expands the lines which load the assets config.assets.debug = true - config.action_mailer.default_url_options = { :host => 'localhost:3000' } - config.action_mailer.delivery_method = :smtp - config.action_mailer.smtp_settings = { - :address => "localhost", - :port => 1025 - } + config.action_mailer.default_url_options = { host: 'localhost:3000' } + config.action_mailer.delivery_method = :letter_opener + # config.action_mailer.delivery_method = :smtp + # config.action_mailer.smtp_settings = { address: "localhost", port: 1025 } config.eager_load = false + + config.after_initialize do + Bullet.enable = true + Bullet.alert = true + Bullet.bullet_logger = true + Bullet.console = true + #Bullet.growl = true + #Bullet.xmpp = { :account => 'bullets_account@jabber.org', + # :password => 'bullets_password_for_jabber', + # :receiver => 'your_account@jabber.org', + # :show_online_status => true } + Bullet.rails_logger = true + #Bullet.airbrake = true + Bullet.add_footer = true + end end diff --git a/config/initializers/rails_admin.rb b/config/initializers/rails_admin.rb index 84215e0..3c3b2b6 100644 --- a/config/initializers/rails_admin.rb +++ b/config/initializers/rails_admin.rb @@ -1,8 +1,6 @@ # RailsAdmin config file. Generated on September 10, 2012 23:57 # See github.com/sferik/rails_admin for more informations -__END__ - RailsAdmin.config do |config| # If your default_local is different from :en, uncomment the following 2 lines and set your default locale here: diff --git a/config/routes.rb b/config/routes.rb index 60223fa..e820f17 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,6 @@ Entrydns::Application.routes.draw do - # mount RailsAdmin::Engine => '/rails_admin', as: 'rails_admin' + mount RailsAdmin::Engine => '/rails_admin', as: 'rails_admin' devise_for :admins