From: Neil Smith Date: Fri, 6 Feb 2009 16:01:19 +0000 (+0000) Subject: Added svn:ignore properties on some files. X-Git-Url: https://git.njae.me.uk/?a=commitdiff_plain;h=24f86acbeb062b31ae5a352c5587a271564a4401;p=depot.git Added svn:ignore properties on some files. --- diff --git a/log/development.log b/log/development.log index 0c57ac8..92b6afa 100644 --- a/log/development.log +++ b/log/development.log @@ -2494,3 +2494,159 @@ ActionController::UnknownAction (No action responded to add_to_cart. Actions: in script/server:3 Rendering /usr/lib/ruby/gems/1.8/gems/actionpack-2.2.2/lib/action_controller/templates/rescues/layout.erb (not_found) + + +Processing ApplicationController#index (for 127.0.0.1 at 2009-02-05 14:36:54) [GET] + + +ActionController::RoutingError (No route matches "/admin/list" with {:method=>:get}): + /usr/lib/ruby/gems/1.8/gems/actionpack-2.2.2/lib/action_controller/routing/recognition_optimisation.rb:66:in `recognize_path' + /usr/lib/ruby/gems/1.8/gems/actionpack-2.2.2/lib/action_controller/routing/route_set.rb:386:in `recognize' + /usr/lib/ruby/gems/1.8/gems/actionpack-2.2.2/lib/action_controller/dispatcher.rb:182:in `handle_request' + /usr/lib/ruby/gems/1.8/gems/actionpack-2.2.2/lib/action_controller/dispatcher.rb:110:in `dispatch_unlocked' + /usr/lib/ruby/gems/1.8/gems/actionpack-2.2.2/lib/action_controller/dispatcher.rb:123:in `dispatch' + /usr/lib/ruby/gems/1.8/gems/actionpack-2.2.2/lib/action_controller/dispatcher.rb:122:in `synchronize' + /usr/lib/ruby/gems/1.8/gems/actionpack-2.2.2/lib/action_controller/dispatcher.rb:122:in `dispatch' + /usr/lib/ruby/gems/1.8/gems/actionpack-2.2.2/lib/action_controller/dispatcher.rb:132:in `dispatch_cgi' + /usr/lib/ruby/gems/1.8/gems/actionpack-2.2.2/lib/action_controller/dispatcher.rb:39:in `dispatch' + /usr/lib/ruby/gems/1.8/gems/rails-2.2.2/lib/webrick_server.rb:103:in `handle_dispatch' + /usr/lib/ruby/gems/1.8/gems/rails-2.2.2/lib/webrick_server.rb:74:in `service' + /usr/lib/ruby/1.8/webrick/httpserver.rb:104:in `service' + /usr/lib/ruby/1.8/webrick/httpserver.rb:65:in `run' + /usr/lib/ruby/1.8/webrick/server.rb:173:in `start_thread' + /usr/lib/ruby/1.8/webrick/server.rb:162:in `start' + /usr/lib/ruby/1.8/webrick/server.rb:162:in `start_thread' + /usr/lib/ruby/1.8/webrick/server.rb:95:in `start' + /usr/lib/ruby/1.8/webrick/server.rb:92:in `each' + /usr/lib/ruby/1.8/webrick/server.rb:92:in `start' + /usr/lib/ruby/1.8/webrick/server.rb:23:in `start' + /usr/lib/ruby/1.8/webrick/server.rb:82:in `start' + /usr/lib/ruby/gems/1.8/gems/rails-2.2.2/lib/webrick_server.rb:60:in `dispatch' + /usr/lib/ruby/gems/1.8/gems/rails-2.2.2/lib/commands/servers/webrick.rb:66 + /usr/local/lib/site_ruby/1.8/rubygems/custom_require.rb:31:in `gem_original_require' + /usr/local/lib/site_ruby/1.8/rubygems/custom_require.rb:31:in `require' + /usr/lib/ruby/gems/1.8/gems/activesupport-2.2.2/lib/active_support/dependencies.rb:153:in `require' + /usr/lib/ruby/gems/1.8/gems/activesupport-2.2.2/lib/active_support/dependencies.rb:521:in `new_constants_in' + /usr/lib/ruby/gems/1.8/gems/activesupport-2.2.2/lib/active_support/dependencies.rb:153:in `require' + /usr/lib/ruby/gems/1.8/gems/rails-2.2.2/lib/commands/server.rb:49 + /usr/local/lib/site_ruby/1.8/rubygems/custom_require.rb:31:in `gem_original_require' + /usr/local/lib/site_ruby/1.8/rubygems/custom_require.rb:31:in `require' + script/server:3 + +Rendering /usr/lib/ruby/gems/1.8/gems/actionpack-2.2.2/lib/action_controller/templates/rescues/layout.erb (not_found) + + +Processing StoreController#index (for 127.0.0.1 at 2009-02-05 14:37:09) [GET] + SQL (0.3ms) SET NAMES 'utf8' + SQL (0.3ms) SET SQL_AUTO_IS_NULL=0 + Product Load (1.2ms) SELECT * FROM `products` WHERE (date_available <= now()) ORDER BY title +Rendering template within layouts/store +Rendering store/index + Product Columns (2.0ms) SHOW FIELDS FROM `products` +Completed in 186ms (View: 152, DB: 2) | 200 OK [http://localhost/store] + + +Processing ProductsController#index (for 127.0.0.1 at 2009-02-05 14:37:13) [GET] + SQL (0.1ms) SET NAMES 'utf8' + SQL (0.1ms) SET SQL_AUTO_IS_NULL=0 + Product Load (0.3ms) SELECT * FROM `products`  +Rendering template within layouts/products +Rendering products/index + Product Columns (2.5ms) SHOW FIELDS FROM `products` +Completed in 274ms (View: 257, DB: 3) | 200 OK [http://localhost/products] + + +Processing ProductsController#edit (for 127.0.0.1 at 2009-02-05 14:37:58) [GET] + Parameters: {"id"=>"3"} + SQL (0.1ms) SET NAMES 'utf8' + SQL (0.1ms) SET SQL_AUTO_IS_NULL=0 + Product Columns (2.3ms) SHOW FIELDS FROM `products` + Product Load (0.6ms) SELECT * FROM `products` WHERE (`products`.`id` = 3)  +Rendering template within layouts/products +Rendering products/edit +Completed in 58ms (View: 39, DB: 3) | 200 OK [http://localhost/products/3/edit] + + +Processing ProductsController#update (for 127.0.0.1 at 2009-02-05 14:38:05) [PUT] + Parameters: {"commit"=>"Update", "authenticity_token"=>"e5d513dc6072444247eccfd6ee064972eb3383d9", "product"=>{"image_url"=>"/images/cardboard-box.jpg", "price"=>"10.05", "title"=>"Cardboard Box", "date_available(1i)"=>"2007", "date_available(2i)"=>"1", "description"=>"

The gift that keeps on giving, you'll wonder how you ever did \r\n without a cardboard box in your home. Us it for a range of uses, \r\n including putting things in and keeping things in. We can provide\r\n you with a cardboard box that is versatile and suitable for any\r\n occasion. Some of our directors even use them for sleeping in!\r\n

\r\n ", "date_available(3i)"=>"1"}, "id"=>"3"} + SQL (0.7ms) SET NAMES 'utf8' + SQL (0.2ms) SET SQL_AUTO_IS_NULL=0 + Product Columns (2.1ms) SHOW FIELDS FROM `products` + Product Load (0.4ms) SELECT * FROM `products` WHERE (`products`.`id` = 3)  + SQL (0.2ms) BEGIN + Product Exists (60.0ms) SELECT `products`.id FROM `products` WHERE (`products`.`title` = BINARY 'Cardboard Box' AND `products`.id <> 3) LIMIT 1 + Product Update (33.7ms) UPDATE `products` SET `price` = 10.05, `description` = '

The gift that keeps on giving, you\'ll wonder how you ever did \r\n without a cardboard box in your home. Us it for a range of uses, \r\n including putting things in and keeping things in. We can provide\r\n you with a cardboard box that is versatile and suitable for any\r\n occasion. Some of our directors even use them for sleeping in!\r\n

\r\n ', `updated_at` = '2009-02-05 14:38:05' WHERE `id` = 3 + SQL (55.2ms) COMMIT +Redirected to # +Completed in 196ms (DB: 153) | 302 Found [http://localhost/products/3] + + +Processing ProductsController#show (for 127.0.0.1 at 2009-02-05 14:38:05) [GET] + Parameters: {"id"=>"3"} + SQL (0.1ms) SET NAMES 'utf8' + SQL (0.1ms) SET SQL_AUTO_IS_NULL=0 + Product Columns (1.2ms) SHOW FIELDS FROM `products` + Product Load (0.4ms) SELECT * FROM `products` WHERE (`products`.`id` = 3)  +Rendering template within layouts/products +Rendering products/show +Completed in 46ms (View: 29, DB: 2) | 200 OK [http://localhost/products/3] + + +Processing ProductsController#index (for 127.0.0.1 at 2009-02-05 14:38:09) [GET] + SQL (0.1ms) SET NAMES 'utf8' + SQL (0.1ms) SET SQL_AUTO_IS_NULL=0 + Product Load (0.4ms) SELECT * FROM `products`  +Rendering template within layouts/products +Rendering products/index + Product Columns (1.1ms) SHOW FIELDS FROM `products` +Completed in 51ms (View: 37, DB: 2) | 200 OK [http://localhost/products] + + +Processing StoreController#index (for 127.0.0.1 at 2009-02-05 14:38:12) [GET] + SQL (0.2ms) SET NAMES 'utf8' + SQL (0.2ms) SET SQL_AUTO_IS_NULL=0 + Product Load (0.5ms) SELECT * FROM `products` WHERE (date_available <= now()) ORDER BY title +Rendering template within layouts/store +Rendering store/index + Product Columns (1.1ms) SHOW FIELDS FROM `products` +Completed in 44ms (View: 32, DB: 1) | 200 OK [http://localhost/store] + + +Processing StoreController#index (for 127.0.0.1 at 2009-02-05 14:40:38) [GET] + SQL (0.1ms) SET NAMES 'utf8' + SQL (0.1ms) SET SQL_AUTO_IS_NULL=0 + Product Load (0.6ms) SELECT * FROM `products` WHERE (date_available <= now()) ORDER BY title +Rendering template within layouts/store +Rendering store/index + Product Columns (1.1ms) SHOW FIELDS FROM `products` +Completed in 49ms (View: 33, DB: 1) | 200 OK [http://localhost/store] + + +Processing StoreController#index (for 127.0.0.1 at 2009-02-05 14:40:53) [GET] + SQL (0.1ms) SET NAMES 'utf8' + SQL (0.1ms) SET SQL_AUTO_IS_NULL=0 + Product Load (0.5ms) SELECT * FROM `products` WHERE (date_available <= now()) ORDER BY title +Rendering template within layouts/store +Rendering store/index + Product Columns (1.3ms) SHOW FIELDS FROM `products` +Completed in 41ms (View: 29, DB: 1) | 200 OK [http://localhost/store] + + +Processing StoreController#index (for 127.0.0.1 at 2009-02-05 14:41:43) [GET] + SQL (0.1ms) SET NAMES 'utf8' + SQL (0.1ms) SET SQL_AUTO_IS_NULL=0 + Product Load (0.8ms) SELECT * FROM `products` WHERE (date_available <= now()) ORDER BY title +Rendering template within layouts/store +Rendering store/index + Product Columns (1.1ms) SHOW FIELDS FROM `products` +Completed in 142ms (View: 29, DB: 1) | 200 OK [http://localhost/store] + + +Processing StoreController#index (for 127.0.0.1 at 2009-02-05 14:41:59) [GET] + SQL (0.1ms) SET NAMES 'utf8' + SQL (0.1ms) SET SQL_AUTO_IS_NULL=0 + Product Load (1.0ms) SELECT * FROM `products` WHERE (date_available <= now()) ORDER BY title +Rendering template within layouts/store +Rendering store/index + Product Columns (2.5ms) SHOW FIELDS FROM `products` +Completed in 44ms (View: 30, DB: 1) | 200 OK [http://localhost/store] diff --git a/public/stylesheets/depot.css b/public/stylesheets/depot.css index c406cf7..a35a5bd 100644 --- a/public/stylesheets/depot.css +++ b/public/stylesheets/depot.css @@ -72,6 +72,7 @@ h1 { #banner img { float: left; + padding: 2px 15px; } #columns {