Commit 02a30ef0 by Calen Pennington

Merge pull request #188 from MITx/dormsbee/portal_display_tweaks

Dormsbee/portal display tweaks
parents c85cf38a b4a8417e
...@@ -42,6 +42,7 @@ class CourseDescriptor(SequenceDescriptor): ...@@ -42,6 +42,7 @@ class CourseDescriptor(SequenceDescriptor):
""" """
This returns the snippet of html to be rendered on the course about page, given the key for the section. This returns the snippet of html to be rendered on the course about page, given the key for the section.
Valid keys: Valid keys:
- overview
- title - title
- university - university
- number - number
...@@ -63,7 +64,7 @@ class CourseDescriptor(SequenceDescriptor): ...@@ -63,7 +64,7 @@ class CourseDescriptor(SequenceDescriptor):
# TODO: Remove number, instructors from this list # TODO: Remove number, instructors from this list
if section_key in ['short_description', 'description', 'key_dates', 'video', 'course_staff_short', 'course_staff_extended', if section_key in ['short_description', 'description', 'key_dates', 'video', 'course_staff_short', 'course_staff_extended',
'requirements', 'syllabus', 'textbook', 'faq', 'more_info', 'number', 'instructors']: 'requirements', 'syllabus', 'textbook', 'faq', 'more_info', 'number', 'instructors', 'overview']:
try: try:
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')
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<img src="${static.url('images/courses/history.png')}"> <img src="${static.url('images/courses/history.png')}">
</div> </div>
<div class="desc"> <div class="desc">
<p>An advanced introduction to analog circuits. An advanced introduction to analog circuits.</p> ${course.get_about_section('short_description')}
</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>
......
...@@ -32,71 +32,15 @@ ...@@ -32,71 +32,15 @@
<section class="details"> <section class="details">
<nav> <nav>
<a href="#" class="active">Overview</a> <a href="#" class="active">Overview</a>
<a href="#">FAQ</a> ## <a href="#">FAQ</a>
<a href="#">Requirements</a> ## <a href="#">Requirements</a>
<a href="#">Text-book</a> ## <a href="#">Text-book</a>
<a href="#">Syllabus</a> ## <a href="#">Syllabus</a>
<a href="#">Reviews</a> ## <a href="#">Reviews</a>
</nav> </nav>
<div class="inner-wrapper"> <div class="inner-wrapper">
<section class="about"> ${course.get_about_section("overview")}
<h2>About this course</h2>
<p>${course.get_about_section("description")}</p>
</section>
<section class="course-staff">
<h2>Course staff</h3>
${course.get_about_section("instructors")}
<!--
<article class="teacher">
<div class="teacher-image">
<img src="${static.url('images/anant.jpg')}" />
</div>
<h3>Anant Agarwal</h3>
<p>Director of MIT’s Computer Science and Artificial Intelligence Laboratory (CSAIL) and a professor of the Electrical Engineering and Computer Science department at MIT. His research focus is in parallel computer architectures and cloud software systems, and he is a founder of several successful startups, including Tilera, a company that produces scalable multicore processors. Prof. Agarwal won MIT’s Smullin and Jamieson prizes for teaching and co-authored the course textbook “Foundations of Analog and Digital Electronic Circuits.”</p>
</article>
<article class="teacher">
<div class="teacher-image">
<img src="${static.url('images/gerald.jpg')}" />
</div>
<h3>Gerald Sussman</h3>
<p>Professor of Electrical Engineering at MIT. He is a well known educator in the computer science community, perhaps best known as the author of Structure and Interpretation of Computer Programs, which is universally acknowledged as one of the top ten textbooks in computer science, and as the creator of Scheme, a popular teaching language. His research spans a range of topics, from artificial intelligence, to physics and chaotic systems, to supercomputer design.</p>
</article>
<article class="teacher">
<div class="teacher-image">
<img src="${static.url('images/piotr.jpg')}" />
</div>
<h3>Piotr Mitros</h3>
<p>Research Scientist at MIT. His research focus is in finding ways to apply techniques from control systems to optimizing the learning process. Dr. Mitros has worked as an analog designer at Texas Instruments, Talking Lights, and most recently, designed the analog front end for a novel medical imaging modality for Rhythmia Medical.</p>
</article>
-->
</section>
<section class="requirements">
<h2>Requirements</h2>
<p>${course.get_about_section("requirements")}</p>
</section>
<section class="syllabus">
<h2>Syllabus</h2>
<p>${course.get_about_section("syllabus")}</p>
</section>
<section class="text-book">
<h2>Textbook</h2>
${course.get_about_section("textbook")}
</section>
<section class="course-faq">
<h2>Frequently Asked Questions</h2>
<p>${course.get_about_section("faq")}</p>
</section>
</div> </div>
</section> </section>
...@@ -119,9 +63,9 @@ ...@@ -119,9 +63,9 @@
<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">7/12/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 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.get_about_section("number")}</span></li> <li><div class="icon number-icon"></div><p>Course Number</p><span class="course-number">${course.number}</span></li>
</ol> </ol>
</section> </section>
</section> </section>
......
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