Commit 824ea6f7 by David Ormsbee

Merge pull request #199 from MITx/dormsbee/course_images

Dormsbee/course images
parents 63fd5b57 8768189d
...@@ -40,6 +40,10 @@ class CourseDescriptor(SequenceDescriptor): ...@@ -40,6 +40,10 @@ class CourseDescriptor(SequenceDescriptor):
return "/".join([self.location.org, self.location.course, self.location.name]) return "/".join([self.location.org, self.location.course, self.location.name])
@property @property
def start_date_text(self):
return time.strftime("%m/%d/%y", self.start)
@property
def title(self): def title(self):
return self.metadata['display_name'] return self.metadata['display_name']
...@@ -86,8 +90,8 @@ class CourseDescriptor(SequenceDescriptor): ...@@ -86,8 +90,8 @@ class CourseDescriptor(SequenceDescriptor):
with self.system.resources_fs.open(path("about") / section_key + ".html") as htmlFile: with self.system.resources_fs.open(path("about") / section_key + ".html") as htmlFile:
return htmlFile.read().decode('utf-8') return htmlFile.read().decode('utf-8')
except ResourceNotFoundError: except ResourceNotFoundError:
log.exception("Missing about section {key} in course {url}".format(key=section_key, url=self.location.url())) log.warning("Missing about section {key} in course {url}".format(key=section_key, url=self.location.url()))
return "! About section missing !" return None
elif section_key == "title": elif section_key == "title":
return self.metadata.get('display_name', self.name) return self.metadata.get('display_name', self.name)
elif section_key == "university": elif section_key == "university":
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</div> </div>
<div class="bottom"> <div class="bottom">
<a href="#" class="university">${course.get_about_section('university')}</a> <a href="#" class="university">${course.get_about_section('university')}</a>
<span class="start-date">7/23/12</span> <span class="start-date">${course.start_date_text}</span>
</div> </div>
</section> </section>
</div> </div>
......
...@@ -23,12 +23,14 @@ ...@@ -23,12 +23,14 @@
</div> </div>
</section> </section>
% if course.get_about_section("video"):
<a href="#video-modal" class="media" rel="leanModal"> <a href="#video-modal" class="media" rel="leanModal">
<div class="hero"> <div class="hero">
<img src="${static.url('images/courses/circuits.jpeg')}" /> <img src="${static.url('images/courses/circuits.jpeg')}" />
<div class="play-intro"></div> <div class="play-intro"></div>
</div> </div>
</a> </a>
% endif
</div> </div>
</header> </header>
...@@ -66,7 +68,7 @@ ...@@ -66,7 +68,7 @@
</header> </header>
<ol class="important-dates"> <ol class="important-dates">
<li><div class="icon start-icon"></div><p>Classes Start</p><span class="start-date">7/12/12</span></li> <li><div class="icon start-icon"></div><p>Classes Start</p><span class="start-date">${course.start_date_text}</span></li>
##<li><div class="icon final-icon"></div><p>Final Exam</p><span class="final-date">12/09/12</span></li> ##<li><div class="icon final-icon"></div><p>Final Exam</p><span class="final-date">12/09/12</span></li>
##<li><div class="icon length-icon"></div><p>Course Length</p><span class="course-length">15 weeks</span></li> ##<li><div class="icon length-icon"></div><p>Course Length</p><span class="course-length">15 weeks</span></li>
<li><div class="icon number-icon"></div><p>Course Number</p><span class="course-number">${course.number}</span></li> <li><div class="icon number-icon"></div><p>Course Number</p><span class="course-number">${course.number}</span></li>
......
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