From 261c43aadea123cc0d416a1447c29eed640a0f06 Mon Sep 17 00:00:00 2001
From: Tom Giannattasio <tom@mitx.mit.edu>
Date: Mon, 26 Nov 2012 13:26:49 -0500
Subject: [PATCH] add sidebar column; fixed main column float bug

---
 cms/static/sass/_unit.scss     |  1 +
 cms/templates/course_info.html | 36 +++++++++++++++++++---------------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/cms/static/sass/_unit.scss b/cms/static/sass/_unit.scss
index a7a33f6024..fdf737fc12 100644
--- a/cms/static/sass/_unit.scss
+++ b/cms/static/sass/_unit.scss
@@ -4,6 +4,7 @@
 }
 
 .main-column {
+  clear: both;
   float: left;
   width: 70%;
 }
diff --git a/cms/templates/course_info.html b/cms/templates/course_info.html
index e5edbccd7e..bd216715c9 100644
--- a/cms/templates/course_info.html
+++ b/cms/templates/course_info.html
@@ -11,20 +11,19 @@
   
   <script type="text/javascript" charset="utf-8">
   $(document).ready(function(){
-  
     var course_updates = new CMS.Models.CourseUpdateCollection();
     course_updates.reset(${course_updates|n});
     course_updates.urlbase = '${url_base}';
     
-      var editor = new CMS.Views.CourseInfoEdit({
-        el: $('.main-wrapper'),
-        model : new CMS.Models.CourseInfo({
-          courseId : '${context_course.location}',
-          updates : course_updates,
-          // FIXME add handouts
-          handouts : null})
-      });
-      editor.render();
+    var editor = new CMS.Views.CourseInfoEdit({
+      el: $('.main-wrapper'),
+      model : new CMS.Models.CourseInfo({
+        courseId : '${context_course.location}',
+        updates : course_updates,
+        // FIXME add handouts
+        handouts : null})
+    });
+    editor.render();
   });
   </script>
 </%block>
@@ -33,12 +32,17 @@
   <div class="main-wrapper">
     <div class="inner-wrapper">
       <h1>Course Info</h1>
-      <article class="unit-body window" id="course-update-view">
-        <h2>Updates</h2>
-        <a href="#" class="new-update-button">New Update</a>
-        <ol class="update-list" id="course-update-list"></ol>
-        <!-- probably replace w/ a vertical where each element of the vertical is a separate update w/ a date and html field -->
-      </article>
+      <div class="main-column">
+        <article class="unit-body window" id="course-update-view">
+          <h2>Updates</h2>
+          <a href="#" class="new-update-button">New Update</a>
+          <ol class="update-list" id="course-update-list"></ol>
+          <!-- probably replace w/ a vertical where each element of the vertical is a separate update w/ a date and html field -->
+        </article>
+      </div>
+      <div class="sidebar window">
+        handouts go here
+      </div>
     </div>
   </div>
   </div>