From f8b48aa757a02ee0a77fa9ff3faf2e064285da97 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Wed, 1 Feb 2012 11:04:52 -0500
Subject: [PATCH] talbe layout

---
 app/assets/stylesheets/habits.css.scss |  2 +-
 app/views/habits/index.html.erb        | 47 ++++++++++++++------------
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/app/assets/stylesheets/habits.css.scss b/app/assets/stylesheets/habits.css.scss
index 4472b1983c..b2557744da 100644
--- a/app/assets/stylesheets/habits.css.scss
+++ b/app/assets/stylesheets/habits.css.scss
@@ -6,4 +6,4 @@
 .iffy { background-color:rgb(246, 178, 107); }
 .ok { background-color:rgb(255, 217, 102); }
 .good { background-color:rgb(147, 196, 125); }
-.done { background-color:rgb(201, 218, 248); }
+.done { background-color:rgb(201, 218, 248); }
\ No newline at end of file
diff --git a/app/views/habits/index.html.erb b/app/views/habits/index.html.erb
index 1995c60f14..30453531d2 100644
--- a/app/views/habits/index.html.erb
+++ b/app/views/habits/index.html.erb
@@ -1,24 +1,27 @@
-<!-- <%= javascript_tag do %>
-  $("#habits").bind("ajax:complete", function(et, e){
-    $("#products-list").html(e.responseText); // insert content
-  });
-<% end %> -->
-
-<h2>Habits</h2>
-
-<ul id="habits">
-<% @habits.each do |habit| %>
-  <li><%= render :partial => "habit", :locals => { :habit => habit } %></li>
-<% end %>
-</ul>
-
-<h2>ToDos</h2>
-<ul id="todos">
-<% @todos.each do |habit| %>
-  <li><%= render :partial => "habit", :locals => { :habit => habit } %></li>
-<% end %>
-</ul>
-
-<br />
 
 <%= link_to 'New Habit', new_habit_path %>
+
+<table>
+  <tr><td>
+  <div id="habits">
+    <h2>Habits</h2>
+    <ul>
+    <% @habits.each do |habit| %>
+      <li><%= render :partial => "habit", :locals => { :habit => habit } %></li>
+    <% end %>
+    </ul>
+  </div>
+  </td>
+  
+  <td>
+  <div id="daily">
+    <h2>Daily</h2>
+    <ul>
+    <% @todos.each do |habit| %>
+      <li><%= render :partial => "habit", :locals => { :habit => habit } %></li>
+    <% end %>
+    </ul>
+  </div>
+  </td></tr>
+  
+</table>