Commit 261c43aa by Tom Giannattasio

add sidebar column; fixed main column float bug

parent f32388f2
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
} }
.main-column { .main-column {
clear: both;
float: left; float: left;
width: 70%; width: 70%;
} }
......
...@@ -11,20 +11,19 @@ ...@@ -11,20 +11,19 @@
<script type="text/javascript" charset="utf-8"> <script type="text/javascript" charset="utf-8">
$(document).ready(function(){ $(document).ready(function(){
var course_updates = new CMS.Models.CourseUpdateCollection(); var course_updates = new CMS.Models.CourseUpdateCollection();
course_updates.reset(${course_updates|n}); course_updates.reset(${course_updates|n});
course_updates.urlbase = '${url_base}'; course_updates.urlbase = '${url_base}';
var editor = new CMS.Views.CourseInfoEdit({ var editor = new CMS.Views.CourseInfoEdit({
el: $('.main-wrapper'), el: $('.main-wrapper'),
model : new CMS.Models.CourseInfo({ model : new CMS.Models.CourseInfo({
courseId : '${context_course.location}', courseId : '${context_course.location}',
updates : course_updates, updates : course_updates,
// FIXME add handouts // FIXME add handouts
handouts : null}) handouts : null})
}); });
editor.render(); editor.render();
}); });
</script> </script>
</%block> </%block>
...@@ -33,12 +32,17 @@ ...@@ -33,12 +32,17 @@
<div class="main-wrapper"> <div class="main-wrapper">
<div class="inner-wrapper"> <div class="inner-wrapper">
<h1>Course Info</h1> <h1>Course Info</h1>
<article class="unit-body window" id="course-update-view"> <div class="main-column">
<h2>Updates</h2> <article class="unit-body window" id="course-update-view">
<a href="#" class="new-update-button">New Update</a> <h2>Updates</h2>
<ol class="update-list" id="course-update-list"></ol> <a href="#" class="new-update-button">New Update</a>
<!-- probably replace w/ a vertical where each element of the vertical is a separate update w/ a date and html field --> <ol class="update-list" id="course-update-list"></ol>
</article> <!-- 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> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment