Updated order display

diff --git a/app/views/orders/index.html.erb b/app/views/orders/index.html.erb
index 640e77e3bea4078a5276769b9bdb2afc8f469eea..308635ebb04f3ec0e7d379960f36e366e059573e 100644 (file)
--- a/app/views/orders/index.html.erb
+++ b/app/views/orders/index.html.erb
@@ -1,4 +1,5 @@
-<h1>Listing orders</h1>
+<div id="product-list">
+  <h1>Listing orders</h1>
 
 <table>
   <tr>
@@ -10,7 +11,7 @@
   </tr>
 
 <% for order in @orders %>
-  <tr>
+  <tr class="<%= cycle('list-line-odd', 'list-line-even') %>">
     <td><%=h order.name %></td>
     <td><%=h order.address %></td>
     <td><%=h order.email %></td>
@@ -21,9 +22,9 @@
     <td><%= link_to 'Destroy', order, :confirm => 'Are you sure?', :method => :delete %></td>
   </tr>
   <% for li in order.line_items %>
-    <tr>
+    <tr class="<%= current_cycle %>">
       <td> </td>
-      <td colspan="3"><i><%= li.quantity%> &times;
+      <td colspan="7"><i><%= li.quantity%> &times;
         <%= h li.product.title %> =
         <%= number_to_currency li.total_price, :unit => "£" %>
       </i></td>
@@ -36,3 +37,4 @@
 <br />
 
 <%= link_to 'New order', new_order_path %>
+</div>
\ No newline at end of file

diff --git a/config/database.sample.yml b/config/database.sample.yml
index f955bb4856ab1c78bdf21a9071df1d52be6f69d1..8acbc82c6cffd99ca043adb4c20227a37dc253c8 100644 (file)
--- a/config/database.sample.yml
+++ b/config/database.sample.yml
@@ -21,7 +21,7 @@ development:
   pool: 5
   username: depot
   password:
-  socket: /var/run/mysqld/mysqld.sock
+  # asocket: /var/run/mysqld/mysqld.sock
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".

diff --git a/db/schema.rb b/db/schema.rb
index 53e465e2b86e208f844f364e8118cd42c0451324..e5e49d93770dc24f0aaa7146efb21c717c1c0822 100644 (file)
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1,64 +1,64 @@
-# This file is auto-generated from the current state of the database. Instead of editing this file, 
-# please use the migrations feature of Active Record to incrementally modify your database, and
-# then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your database schema. If you need
-# to create the application database on another system, you should be using db:schema:load, not running
-# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended to check this file into your version control system.
-
-ActiveRecord::Schema.define(:version => 20090311202750) do
-
-  create_table "line_items", :force => true do |t|
-    t.integer  "product_id",                                :null => false
-    t.integer  "order_id",                                  :null => false
-    t.integer  "quantity",                                  :null => false
-    t.decimal  "total_price", :precision => 8, :scale => 2, :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "line_items", ["order_id"], :name => "fk_line_item_orders"
-  add_index "line_items", ["product_id"], :name => "fk_line_item_products"
-
-  create_table "orders", :force => true do |t|
-    t.string   "name"
-    t.text     "address"
-    t.string   "email"
-    t.string   "pay_type",   :limit => 10
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "products", :force => true do |t|
-    t.string   "title"
-    t.text     "description"
-    t.string   "image_url"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.decimal  "price",                :precision => 8, :scale => 2, :default => 0.0
-    t.date     "date_available"
-    t.date     "date_available_until"
-  end
-
-  create_table "sessions", :force => true do |t|
-    t.string   "session_id", :null => false
-    t.text     "data"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
-  add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"
-
-  create_table "users", :force => true do |t|
-    t.string   "name"
-    t.string   "hashed_password"
-    t.string   "salt"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-end
+# This file is auto-generated from the current state of the database. Instead of editing this file, \r
+# please use the migrations feature of Active Record to incrementally modify your database, and\r
+# then regenerate this schema definition.\r
+#\r
+# Note that this schema.rb definition is the authoritative source for your database schema. If you need\r
+# to create the application database on another system, you should be using db:schema:load, not running\r
+# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations\r
+# you'll amass, the slower it'll run and the greater likelihood for issues).\r
+#\r
+# It's strongly recommended to check this file into your version control system.\r
+\r
+ActiveRecord::Schema.define(:version => 20090311202750) do\r
+\r
+  create_table "line_items", :force => true do |t|\r
+    t.integer  "product_id",                                :null => false\r
+    t.integer  "order_id",                                  :null => false\r
+    t.integer  "quantity",                                  :null => false\r
+    t.decimal  "total_price", :precision => 8, :scale => 2, :null => false\r
+    t.datetime "created_at"\r
+    t.datetime "updated_at"\r
+  end\r
+\r
+  add_index "line_items", ["order_id"], :name => "fk_line_item_orders"\r
+  add_index "line_items", ["product_id"], :name => "fk_line_item_products"\r
+\r
+  create_table "orders", :force => true do |t|\r
+    t.string   "name"\r
+    t.text     "address"\r
+    t.string   "email"\r
+    t.string   "pay_type",   :limit => 10\r
+    t.datetime "created_at"\r
+    t.datetime "updated_at"\r
+  end\r
+\r
+  create_table "products", :force => true do |t|\r
+    t.string   "title"\r
+    t.text     "description"\r
+    t.string   "image_url"\r
+    t.datetime "created_at"\r
+    t.datetime "updated_at"\r
+    t.decimal  "price",                :precision => 8, :scale => 2, :default => 0.0\r
+    t.date     "date_available"\r
+    t.date     "date_available_until"\r
+  end\r
+\r
+  create_table "sessions", :force => true do |t|\r
+    t.string   "session_id", :default => "", :null => false\r
+    t.text     "data"\r
+    t.datetime "created_at"\r
+    t.datetime "updated_at"\r
+  end\r
+\r
+  add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"\r
+  add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"\r
+\r
+  create_table "users", :force => true do |t|\r
+    t.string   "name"\r
+    t.string   "hashed_password"\r
+    t.string   "salt"\r
+    t.datetime "created_at"\r
+    t.datetime "updated_at"\r
+  end\r
+\r
+end\r