Permalink
Browse files

cosmetic design fix

  • Loading branch information...
1 parent 419b047 commit e80e21e7bcca3fe2a0cfe851eee00d63c7aad82c @dissdoc committed Feb 4, 2012
Showing with 266 additions and 2 deletions.
  1. +3 −1 app/views/home/_show.html.erb
  2. +1 −1 app/views/layouts/application.html.erb
  3. +262 −0 log/development.log
@@ -1,5 +1,7 @@
-<% if current_user %>
+<% if current_user %>
+ <p>Мое меню:
<%= link_to "Мои компании", companies_path %>
+ </p>
<% else %>
<h4>Чтобы начать пользоваться сервисом, вам необходимо авторизоваться</h4>
<% end %>
@@ -17,7 +17,7 @@
<%= render "home/auth_menu" %>
- <p>Мое меню: <%= render "home/show" %></p>
+ <%= render "home/show" %>
<p><%= breadcrumbs('->') %></p>
View
@@ -41532,3 +41532,265 @@ Rendered resources/_resources.html.erb (34.6ms)
Rendered resources/_feeds.html.erb (48.5ms)
Rendered resources/create.js.erb (66.2ms)
Completed 200 OK in 532ms (Views: 90.1ms | ActiveRecord: 72.1ms)
+
+
+Started DELETE "/resources/21" for 127.0.0.1 at 2012-02-04 16:02:50 +0400
+ Processing by ResourcesController#destroy as JS
+ Parameters: {"id"=>"21"}
+ User Load (1.1ms) SELECT `users`.* FROM `users` WHERE `users`.`id` = 1 LIMIT 1
+ Resource Load (1.3ms) SELECT `resources`.* FROM `resources` WHERE `resources`.`id` = 21 ORDER BY resources.created_at DESC LIMIT 1
+ Company Load (1.0ms) SELECT `companies`.* FROM `companies` WHERE `companies`.`id` = 9 ORDER BY companies.created_at DESC LIMIT 1
+  (0.4ms) BEGIN
+ Event Load (1.1ms) SELECT `events`.* FROM `events` WHERE `events`.`resource_id` = 21
+ SQL (1.5ms) DELETE FROM `resources` WHERE `resources`.`id` = 21
+  (49.7ms) COMMIT
+  (1.2ms) SELECT COUNT(*) FROM `resources` WHERE `resources`.`company_id` = 9
+ Resource Load (2.2ms) SELECT `resources`.* FROM `resources` WHERE `resources`.`company_id` = 9 ORDER BY resources.created_at DESC
+Rendered resources/_resources.html.erb (34.9ms)
+Rendered resources/_feeds.html.erb (51.6ms)
+Rendered resources/destroy.js.erb (56.5ms)
+Completed 200 OK in 701ms (Views: 88.0ms | ActiveRecord: 78.3ms)
+
+
+Started DELETE "/resources/20" for 127.0.0.1 at 2012-02-04 16:02:53 +0400
+ Processing by ResourcesController#destroy as JS
+ Parameters: {"id"=>"20"}
+ User Load (1.1ms) SELECT `users`.* FROM `users` WHERE `users`.`id` = 1 LIMIT 1
+ Resource Load (1.4ms) SELECT `resources`.* FROM `resources` WHERE `resources`.`id` = 20 ORDER BY resources.created_at DESC LIMIT 1
+ Company Load (0.9ms) SELECT `companies`.* FROM `companies` WHERE `companies`.`id` = 9 ORDER BY companies.created_at DESC LIMIT 1
+  (0.4ms) BEGIN
+ Event Load (1.1ms) SELECT `events`.* FROM `events` WHERE `events`.`resource_id` = 20
+ SQL (0.9ms) DELETE FROM `resources` WHERE `resources`.`id` = 20
+  (100.9ms) COMMIT
+  (1.1ms) SELECT COUNT(*) FROM `resources` WHERE `resources`.`company_id` = 9
+ Resource Load (2.0ms) SELECT `resources`.* FROM `resources` WHERE `resources`.`company_id` = 9 ORDER BY resources.created_at DESC
+Rendered resources/_resources.html.erb (38.4ms)
+Rendered resources/_feeds.html.erb (54.5ms)
+Rendered resources/destroy.js.erb (59.5ms)
+Completed 200 OK in 778ms (Views: 87.2ms | ActiveRecord: 128.0ms)
+
+
+Started GET "/" for 127.0.0.1 at 2012-02-04 18:21:29 +0400
+ Processing by HomeController#index as HTML
+  (44.8ms) SELECT COUNT(*) FROM `companies` 
+ Company Load (5.7ms) SELECT `companies`.* FROM `companies` ORDER BY companies.created_at DESC
+ User Load (1.3ms) SELECT `users`.* FROM `users` WHERE `users`.`id` = 1 LIMIT 1
+ User Load (1.9ms) SELECT `users`.* FROM `users` WHERE `users`.`id` = 2 LIMIT 1
+Rendered companies/_company.html.erb (500.3ms)
+Rendered home/index.html.erb within layouts/application (1070.6ms)
+ CACHE (0.0ms) SELECT `users`.* FROM `users` WHERE `users`.`id` = 1 LIMIT 1
+  (0.5ms) BEGIN
+  (0.3ms) COMMIT
+  (0.3ms) BEGIN
+  (64.6ms) UPDATE `users` SET `last_sign_in_at` = '2012-02-04 11:30:22', `current_sign_in_at` = '2012-02-04 14:21:34', `sign_in_count` = 11, `updated_at` = '2012-02-04 14:21:35' WHERE `users`.`id` = 1
+  (79.2ms) COMMIT
+Rendered home/_auth_menu.html.erb (739.5ms)
+Rendered home/_show.html.erb (5.4ms)
+Completed 200 OK in 3568ms (Views: 2271.7ms | ActiveRecord: 525.4ms)
+
+
+Started DELETE "/users/sign_out" for 127.0.0.1 at 2012-02-04 18:35:03 +0400
+ Processing by Devise::SessionsController#destroy as HTML
+ Parameters: {"authenticity_token"=>"WBN5ow/A9/H8s8Hyc/WuFuGFfUR2Z9AmtN46Bs3EUf8="}
+ User Load (32.0ms) SELECT `users`.* FROM `users` WHERE `users`.`id` = 1 LIMIT 1
+  (0.3ms) BEGIN
+  (1.1ms) UPDATE `users` SET `remember_created_at` = NULL, `updated_at` = '2012-02-04 14:35:04' WHERE `users`.`id` = 1
+  (71.6ms) COMMIT
+Redirected to http://localhost:3000/
+Completed 302 Found in 770ms
+
+
+Started GET "/" for 127.0.0.1 at 2012-02-04 18:35:04 +0400
+ Processing by HomeController#index as HTML
+  (0.5ms) SELECT COUNT(*) FROM `companies` 
+ Company Load (0.7ms) SELECT `companies`.* FROM `companies` ORDER BY companies.created_at DESC
+ User Load (1.3ms) SELECT `users`.* FROM `users` WHERE `users`.`id` = 1 LIMIT 1
+ User Load (1.2ms) SELECT `users`.* FROM `users` WHERE `users`.`id` = 2 LIMIT 1
+Rendered companies/_company.html.erb (202.7ms)
+Rendered home/index.html.erb within layouts/application (226.5ms)
+Rendered home/_auth_menu.html.erb (6.4ms)
+Rendered home/_show.html.erb (0.6ms)
+Completed 200 OK in 367ms (Views: 285.4ms | ActiveRecord: 14.9ms)
+
+
+Started GET "/users/sign_in" for 127.0.0.1 at 2012-02-04 18:35:35 +0400
+ Processing by Devise::SessionsController#new as HTML
+Rendered devise/_links.erb (19.6ms)
+Rendered devise/sessions/new.html.erb within layouts/application (66.6ms)
+Rendered home/_auth_menu.html.erb (6.4ms)
+Rendered home/_show.html.erb (0.6ms)
+Completed 200 OK in 292ms (Views: 148.8ms | ActiveRecord: 4.4ms)
+
+
+Started POST "/users/sign_in" for 127.0.0.1 at 2012-02-04 18:35:58 +0400
+ Processing by Devise::SessionsController#create as HTML
+ Parameters: {"utf8"=>"✓", "authenticity_token"=>"3expJdDwW18HffXm7PyNbYr5aQyxu/tDqQmGgHRZTYg=", "user"=>{"email"=>"kir@kir.ru", "password"=>"[FILTERED]", "remember_me"=>"1"}, "commit"=>"Sign in"}
+ User Load (24.6ms) SELECT `users`.* FROM `users` WHERE `users`.`email` = 'kir@kir.ru' LIMIT 1
+  (0.3ms) BEGIN
+  (1.0ms) UPDATE `users` SET `remember_created_at` = '2012-02-04 14:35:59', `updated_at` = '2012-02-04 14:35:59' WHERE `users`.`id` = 1
+  (69.9ms) COMMIT
+  (0.3ms) BEGIN
+  (1.4ms) UPDATE `users` SET `last_sign_in_at` = '2012-02-04 14:21:34', `current_sign_in_at` = '2012-02-04 14:35:59', `sign_in_count` = 12, `updated_at` = '2012-02-04 14:35:59' WHERE `users`.`id` = 1
+  (39.5ms) COMMIT
+Redirected to http://localhost:3000/
+Completed 302 Found in 1152ms
+
+
+Started GET "/" for 127.0.0.1 at 2012-02-04 18:35:59 +0400
+ Processing by HomeController#index as HTML
+  (0.4ms) SELECT COUNT(*) FROM `companies`
+ Company Load (0.7ms) SELECT `companies`.* FROM `companies` ORDER BY companies.created_at DESC
+ User Load (1.3ms) SELECT `users`.* FROM `users` WHERE `users`.`id` = 1 LIMIT 1
+ User Load (1.5ms) SELECT `users`.* FROM `users` WHERE `users`.`id` = 2 LIMIT 1
+Rendered companies/_company.html.erb (179.7ms)
+Rendered home/index.html.erb within layouts/application (200.4ms)
+ CACHE (0.0ms) SELECT `users`.* FROM `users` WHERE `users`.`id` = 1 LIMIT 1
+Rendered home/_auth_menu.html.erb (4.9ms)
+Rendered home/_show.html.erb (2.5ms)
+Completed 200 OK in 297ms (Views: 235.1ms | ActiveRecord: 13.0ms)
+
+
+Started GET "/" for 127.0.0.1 at 2012-02-04 18:37:39 +0400
+ Processing by HomeController#index as HTML
+  (0.4ms) SELECT COUNT(*) FROM `companies` 
+ Company Load (1.0ms) SELECT `companies`.* FROM `companies` ORDER BY companies.created_at DESC
+ User Load (1.0ms) SELECT `users`.* FROM `users` WHERE `users`.`id` = 1 LIMIT 1
+ User Load (0.8ms) SELECT `users`.* FROM `users` WHERE `users`.`id` = 2 LIMIT 1
+Rendered companies/_company.html.erb (171.7ms)
+Rendered home/index.html.erb within layouts/application (196.2ms)
+ CACHE (0.0ms) SELECT `users`.* FROM `users` WHERE `users`.`id` = 1 LIMIT 1
+Rendered home/_auth_menu.html.erb (8.4ms)
+Rendered home/_show.html.erb (5.4ms)
+Completed 200 OK in 305ms (Views: 233.4ms | ActiveRecord: 16.5ms)
+
+
+Started DELETE "/users/sign_out" for 127.0.0.1 at 2012-02-04 18:37:47 +0400
+ Processing by Devise::SessionsController#destroy as HTML
+ Parameters: {"authenticity_token"=>"3expJdDwW18HffXm7PyNbYr5aQyxu/tDqQmGgHRZTYg="}
+ User Load (1.1ms) SELECT `users`.* FROM `users` WHERE `users`.`id` = 1 LIMIT 1
+  (0.3ms) BEGIN
+  (0.8ms) UPDATE `users` SET `remember_created_at` = NULL, `updated_at` = '2012-02-04 14:37:47' WHERE `users`.`id` = 1
+  (77.7ms) COMMIT
+Redirected to http://localhost:3000/
+Completed 302 Found in 242ms
+
+
+Started GET "/" for 127.0.0.1 at 2012-02-04 18:37:47 +0400
+ Processing by HomeController#index as HTML
+  (0.5ms) SELECT COUNT(*) FROM `companies`
+ Company Load (0.8ms) SELECT `companies`.* FROM `companies` ORDER BY companies.created_at DESC
+ User Load (1.2ms) SELECT `users`.* FROM `users` WHERE `users`.`id` = 1 LIMIT 1
+ User Load (1.4ms) SELECT `users`.* FROM `users` WHERE `users`.`id` = 2 LIMIT 1
+Rendered companies/_company.html.erb (189.3ms)
+Rendered home/index.html.erb within layouts/application (210.2ms)
+Rendered home/_auth_menu.html.erb (3.9ms)
+Rendered home/_show.html.erb (0.5ms)
+Completed 200 OK in 301ms (Views: 235.9ms | ActiveRecord: 13.2ms)
+
+
+Started GET "/users/sign_in" for 127.0.0.1 at 2012-02-04 18:37:55 +0400
+ Processing by Devise::SessionsController#new as HTML
+Rendered devise/_links.erb (5.5ms)
+Rendered devise/sessions/new.html.erb within layouts/application (23.8ms)
+Rendered home/_auth_menu.html.erb (5.1ms)
+Rendered home/_show.html.erb (0.4ms)
+Completed 200 OK in 322ms (Views: 78.4ms | ActiveRecord: 4.5ms)
+
+
+Started POST "/users/sign_in" for 127.0.0.1 at 2012-02-04 18:37:58 +0400
+ Processing by Devise::SessionsController#create as HTML
+ Parameters: {"utf8"=>"✓", "authenticity_token"=>"I0FYyBK/G7VOQ8GIZtGk4Wq5bOut7xbWO/wHNWAz0Ns=", "user"=>{"email"=>"kir@kir.ru", "password"=>"[FILTERED]", "remember_me"=>"1"}, "commit"=>"Sign in"}
+ User Load (1.6ms) SELECT `users`.* FROM `users` WHERE `users`.`email` = 'kir@kir.ru' LIMIT 1
+  (0.5ms) BEGIN
+  (0.8ms) UPDATE `users` SET `remember_created_at` = '2012-02-04 14:37:59', `updated_at` = '2012-02-04 14:37:59' WHERE `users`.`id` = 1
+  (60.1ms) COMMIT
+  (0.4ms) BEGIN
+  (3.9ms) UPDATE `users` SET `last_sign_in_at` = '2012-02-04 14:35:59', `current_sign_in_at` = '2012-02-04 14:37:59', `sign_in_count` = 13, `updated_at` = '2012-02-04 14:37:59' WHERE `users`.`id` = 1
+  (40.3ms) COMMIT
+Redirected to http://localhost:3000/
+Completed 302 Found in 599ms
+
+
+Started GET "/" for 127.0.0.1 at 2012-02-04 18:37:59 +0400
+ Processing by HomeController#index as HTML
+  (0.6ms) SELECT COUNT(*) FROM `companies` 
+ Company Load (1.3ms) SELECT `companies`.* FROM `companies` ORDER BY companies.created_at DESC
+ User Load (1.3ms) SELECT `users`.* FROM `users` WHERE `users`.`id` = 1 LIMIT 1
+ User Load (1.7ms) SELECT `users`.* FROM `users` WHERE `users`.`id` = 2 LIMIT 1
+Rendered companies/_company.html.erb (218.4ms)
+Rendered home/index.html.erb within layouts/application (245.3ms)
+ CACHE (0.0ms) SELECT `users`.* FROM `users` WHERE `users`.`id` = 1 LIMIT 1
+Rendered home/_auth_menu.html.erb (4.7ms)
+Rendered home/_show.html.erb (2.6ms)
+Completed 200 OK in 365ms (Views: 280.2ms | ActiveRecord: 17.2ms)
+
+
+Started GET "/companies" for 127.0.0.1 at 2012-02-04 18:38:21 +0400
+ Processing by CompaniesController#index as HTML
+ User Load (1.1ms) SELECT `users`.* FROM `users` WHERE `users`.`id` = 1 LIMIT 1
+  (2.0ms) SELECT COUNT(*) FROM `companies` WHERE `companies`.`user_id` = 1
+ Company Load (1.5ms) SELECT `companies`.* FROM `companies` WHERE `companies`.`user_id` = 1 ORDER BY companies.created_at DESC
+ CACHE (0.0ms) SELECT `users`.* FROM `users` WHERE `users`.`id` = 1 LIMIT 1
+Rendered companies/_user_company.html.erb (75.9ms)
+Rendered companies/_list.html.erb (102.3ms)
+Rendered companies/index.html.erb within layouts/application (126.5ms)
+Rendered home/_auth_menu.html.erb (3.2ms)
+Rendered home/_show.html.erb (3.6ms)
+Completed 200 OK in 596ms (Views: 204.6ms | ActiveRecord: 14.2ms)
+
+
+Started GET "/companies/9" for 127.0.0.1 at 2012-02-04 18:38:23 +0400
+ Processing by CompaniesController#show as HTML
+ Parameters: {"id"=>"9"}
+ User Load (0.9ms) SELECT `users`.* FROM `users` WHERE `users`.`id` = 1 LIMIT 1
+ Company Load (1.4ms) SELECT `companies`.* FROM `companies` WHERE `companies`.`user_id` = 1 AND `companies`.`id` = 9 ORDER BY companies.created_at DESC LIMIT 1
+ Company Load (0.8ms) SELECT `companies`.* FROM `companies` WHERE `companies`.`id` = 9 ORDER BY companies.created_at DESC LIMIT 1
+ Resource Load (1.2ms) SELECT `resources`.* FROM `resources` WHERE `resources`.`company_id` = 9 ORDER BY resources.created_at DESC
+Rendered shared/_error_messages.html.erb (3.1ms)
+Rendered resources/_form.html.erb (90.5ms)
+Rendered resources/_resources.html.erb (40.3ms)
+Rendered resources/_feeds.html.erb (49.2ms)
+Rendered companies/show.html.erb within layouts/application (172.2ms)
+Rendered home/_auth_menu.html.erb (2.5ms)
+Rendered home/_show.html.erb (1.6ms)
+Completed 200 OK in 662ms (Views: 234.0ms | ActiveRecord: 27.5ms)
+
+
+Started GET "/resources/19" for 127.0.0.1 at 2012-02-04 18:38:27 +0400
+ Processing by ResourcesController#show as HTML
+ Parameters: {"id"=>"19"}
+ User Load (1.1ms) SELECT `users`.* FROM `users` WHERE `users`.`id` = 1 LIMIT 1
+ Resource Load (1.5ms) SELECT `resources`.* FROM `resources` WHERE `resources`.`id` = 19 ORDER BY resources.created_at DESC LIMIT 1
+ Event Load (43.7ms) SELECT `events`.* FROM `events` WHERE `events`.`resource_id` = 19 AND (('2012-01-28 20:00:00' <= end_at) AND (start_at< '2012-03-03 20:00:00')) ORDER BY start_at ASC
+ Company Load (1.1ms) SELECT `companies`.* FROM `companies` WHERE `companies`.`id` = 9 ORDER BY companies.created_at DESC LIMIT 1
+Rendered shared/_error_messages.html.erb (0.3ms)
+Rendered events/_form.html.erb (160.9ms)
+Rendered events/_item.html.erb (82.3ms)
+Rendered resources/show.html.erb within layouts/application (253.3ms)
+Rendered home/_auth_menu.html.erb (3.8ms)
+Rendered home/_show.html.erb (2.3ms)
+Completed 200 OK in 979ms (Views: 411.9ms | ActiveRecord: 101.7ms)
+
+
+Started DELETE "/users/sign_out" for 127.0.0.1 at 2012-02-04 18:38:41 +0400
+ Processing by Devise::SessionsController#destroy as HTML
+ Parameters: {"authenticity_token"=>"I0FYyBK/G7VOQ8GIZtGk4Wq5bOut7xbWO/wHNWAz0Ns="}
+ User Load (1.2ms) SELECT `users`.* FROM `users` WHERE `users`.`id` = 1 LIMIT 1
+  (0.3ms) BEGIN
+  (1.1ms) UPDATE `users` SET `remember_created_at` = NULL, `updated_at` = '2012-02-04 14:38:42' WHERE `users`.`id` = 1
+  (51.0ms) COMMIT
+Redirected to http://localhost:3000/
+Completed 302 Found in 265ms
+
+
+Started GET "/" for 127.0.0.1 at 2012-02-04 18:38:42 +0400
+ Processing by HomeController#index as HTML
+  (0.5ms) SELECT COUNT(*) FROM `companies`
+ Company Load (1.1ms) SELECT `companies`.* FROM `companies` ORDER BY companies.created_at DESC
+ User Load (1.7ms) SELECT `users`.* FROM `users` WHERE `users`.`id` = 1 LIMIT 1
+ User Load (1.3ms) SELECT `users`.* FROM `users` WHERE `users`.`id` = 2 LIMIT 1
+Rendered companies/_company.html.erb (183.7ms)
+Rendered home/index.html.erb within layouts/application (305.8ms)
+Rendered home/_auth_menu.html.erb (6.8ms)
+Rendered home/_show.html.erb (0.7ms)
+Completed 200 OK in 398ms (Views: 334.2ms | ActiveRecord: 22.4ms)

0 comments on commit e80e21e

Please sign in to comment.