Skip to content

E
edx-platform
Commit e1225834 by Bridger Maxwell
Options

Merge branch 'dormsbee/multicourse' into multicourse_wiki

parents 064274a7 506ee58b
Showing with 245 additions and 108 deletions
lms/djangoapps/student/views.py
......@@ -39,7 +39,7 @@ def index(request):
''' Redirects to main page -- info page if user authenticated, or marketing if not
'''
if settings.COURSEWARE_ENABLED and request.user.is_authenticated():
return redirect('/courses')
return redirect(reverse('dashboard'))
else:
csrf_token = csrf(request)['csrf_token']
# TODO: Clean up how 'error' is done.
......
lms/static/js/course_info.js
......@@ -2,10 +2,10 @@ $(document).ready(function () {
$('ul.tabs li').click(function() {
$('ul.tabs li').removeClass("enabled");
$(this).addClass("enabled");
var data_class = '.' + $(this).attr('data-class');
$('.tab').slideUp();
$(data_class + ':hidden').slideDown();
})
});
\ No newline at end of file
});
lms/static/js/toggle_login_modal.js
......@@ -16,5 +16,14 @@ $(document).ready(function () {
$('.modal.signup-modal').removeClass("visible");
$('.modal-overlay').removeClass("visible");
});
$('.hero').click(function() {
$('.modal.video-modal').addClass("visible");
$('.modal-overlay').addClass("visible");
});
$('div.close-modal').click(function() {
$('.modal.video-modal').removeClass("visible");
$('.modal-overlay').removeClass("visible");
});
});
lms/static/sass/_shared_list_of_courses.scss
......@@ -57,16 +57,6 @@
text-overflow: ellipsis;
white-space: nowrap;
}
p {
color: $base-font-color;
display: none;
font: normal 1rem/1.6rem $sans-serif;
overflow: hidden;
text-shadow: 0 1px rgba(255,255,255, 0.6);
text-overflow: ellipsis;
white-space: nowrap;
}
}
.info-link {
......
lms/static/sass/_shared_modal.scss
......@@ -34,6 +34,21 @@
display: block;
}
&.video-modal {
//height: 360px;
left: 50%;
margin-left: -320px;
//margin-top: -180px;
//top: 50%;
width: 642px;
.inner-wrapper {
height: 360px;
padding: 0px;
width: 640px;
}
}
.inner-wrapper {
background: rgb(240,240,240);
@include border-radius(0px);
......
lms/templates/6002.html
<%inherit file="main.html" />
<%include file="guest_navigation.html" args="active_page='info'" />
<<<<<<< HEAD
<%namespace name='static' file='static_content.html'/>
<section class="container">
<section class="course-info">
......@@ -112,6 +113,85 @@
<section class="faq tab">
<h3>Frequently Asked Questions</h3>
=======
<section class="course-info">
<header class="course-profile">
<div class="intro-inner-wrapper">
<section class="intro">
<hgroup>
<h1>18th Century History <span class="course-number">(HC137)</span></h1>
<hr>
<h2><a href="#">HarvardX</a></h2>
</hgroup>
</section>
<section class="actions">
<a href="#" class="register">Register</a>
<section class="social-sharing">
</section>
</section>
</div>
</header>
<section class="container">
<section class="details">
<nav>
<a href="#" class="active">Overview</a>
<a href="#">FAQ</a>
<a href="#">Requirements</a>
<a href="#">Text-book</a>
<a href="#">Syllabus</a>
<a href="#">Reviews</a>
</nav>
<div class="inner-wrapper">
<section class="about">
<h2>About this course</h2>
<p>This course explores the history of the modern world since Chinggis Khan. It focuses on the connections between societies from the time of the Mongol conquests and the gradual, but accelerating ways in which connections became ties of inter-dependence. The relations between societies are what will concern us. The forces pulling the world together vary from religious to economic, political to intellectual. These forces bring the world together, but they also create new divisions. Nowadays, we call this "globalization." That term has tended to emphasize the drive to worldwide integration; the view of globalization taken in this course emphasizes disintegration as well as integration. We will tackle some very basic questions: How do we explain the staggering wealth of China in the centuries up to 1750, as well as China's recent ascent? Where did the United States come from, and where is it headed? What are the significance and legacies of empire in the world? How have world wars and revolutions shaped the international system over time? What exactly is globalization, and how does today's globalization compare with the past? How has the relationship between humans and nature changed over the centuries?</p>
<h2>Requirements</h2>
<p>In order to succeed in this course, you must have taken an AP level physics course in electricity and magnetism. You must know basic calculus and linear algebra and have some background in differential equations. Since more advanced mathematics will not show up until the second half of the course, the first half of the course will include an optional remedial differential equations component for those who need it.</p>
<p>The course web site was developed and tested primarily with Google Chrome. We support current versions of Mozilla Firefox as well. The video player is designed to work with Flash. While we provide a partial non-Flash fallback for the video, as well as partial support for Internet Explorer, other browsers, and tablets, portions of the functionality will be unavailable.</p>
</section>
<section class="course-staff">
<h2>Course staff</h3>
<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="syllabus">
<h2>Syllabus</h2>
</section>
<section class="textbook">
<h2>Textbook</h2>
<p>The course uses the textbook Foundations of Analog and Digital Electronic Circuits, by Anant Agarwal and Jeffrey H. Lang. Morgan Kaufmann Publishers, Elsevier, July 2005. While recommended, the book is not required: relevant sections will be provided electronically as part of the online course for personal use in connection with this course only. The copyright for the book is owned by Elsevier. The book can be purchased on <a href="http://www.amazon.com/exec/obidos/ASIN/1558607358/ref=nosim/mitopencourse-20">Amazon</a>.</p>
</section>
<section class="faq">
<h2>Frequently Asked Questions</h2>
>>>>>>> cleans up course info/profile page
<ul>
<li>What is the format of the class?
<p>The course will consist of 24 lectures, each lasting 50 minutes. There will be regular assignments consisting of map tests and short essays.</p>
......@@ -127,6 +207,7 @@
</li>
</ul>
</section>
<<<<<<< HEAD
<section class="more-info tab">
<section class="who-should-take">
......@@ -224,5 +305,33 @@
<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></li>
</ul>
=======
</section>
</div>
<section class="course-sidebar">
<div class="media">
<div class="hero">
<img src="${static.url('images/history.png')}" />
</div>
</div>
<section class="dates">
<h3>Important Dates</h3>
<p>Class Starts: <span class="start-date">7/12/12</span></p>
<p>Final Exam: <span class="start-date">12/09/12</span></p>
<p>Total Length: <span class="course-length">15 weeks</span></p>
</section>
<section class="course-abstract">
<h3>Course Sumamry</h3>
<p>This course will examine the ways in which the world has grown more integrated yet more divided over the past 300 years.</p>
</section>
<section class="dates">
<p>Course Number <span class="start-date">HC137</span></p>
</section>
</section>
>>>>>>> cleans up course info/profile page
</section>
</section>
lms/templates/course.html
......@@ -4,20 +4,19 @@
%>
%for course in courses:
<article class="course">
<article id="${course.id}"class="course">
<div class="inner-wrapper">
<header class="course-preview">
<a href="${reverse('about_course', args=[course.id])}">
<hgroup>
<h2>${course.title}</h2>
<p>${course.institution}</p>
</hgroup>
<div href="" class="info-link">&#x2794;</div>
<div class="info-link">&#x2794;</div>
</a>
</header>
<section class="info">
<div class="meta-info">
<p class="university">HarvardX</p>
<p class="university">${course.institution}</p>
<p class="dates"><span class="start">7/23/12</span> &rarr; <span class="end">12/15/12</span></p>
</div>
<div class="cover-image">
......
lms/templates/main.html
......@@ -67,7 +67,9 @@
<%include file="footer.html" />
<%block name="js_extra"/>
<script src="${static.url('js/my_courses_dropdown.js')}"></script>
<script src="${static.url('js/sticky_footer.js')}"></script>
<!--
-<script src="${static.url('js/sticky_footer.js')}"></script>
-->
<script src="${static.url('js/toggle_login_modal.js')}"></script>
<script src="${static.url('js/sticky_filter.js')}"></script>
......
lms/templates/portal/course_about.html
......@@ -6,107 +6,109 @@
<%inherit file="../main.html" />
<section class="container">
<section class="course-info">
<header>
<img src="${static.url('images/harvard_cropped.png')}" />
<h2>${course.get_about_section("title")} <span class="course-number">(${course.get_about_section("number")})</span></h3>
<h3>${course.get_about_section("university")}</h3>
<div class="course-abstract">
<p>${course.get_about_section("short_description")}</p>
</div>
<a class="button sign-up" href="${reverse('enroll', args=[course.id])}">Sign up</a>
</header>
<section class="sidebar">
<div class="faded-vertical-divider"></div>
<section class="course-staff">
<h3>About the course staff</h3>
<div class="teacher">
<div class="teacher-image">
<img src="${static.url('images/anant.jpg')}" />
</div>
<h3 class="teacher-name">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>
</div> <!-- .teacher -->
<div class="teacher">
<div class="teacher-image">
<img src="${static.url('images/gerald.jpg')}" />
</div>
<h3 class="teacher-name">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>
</div> <!-- .teacher -->
<div class="teacher">
<div class="teacher-image">
<img src="${static.url('images/piotr.jpg')}" />
</div>
<h3 class="teacher-name">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>
</div> <!-- .teacher -->
<section class="course-info">
<header class="course-profile">
<div class="intro-inner-wrapper">
<section class="intro">
<hgroup>
<h1>${course.get_about_section("title")} <h2><a href="#">${course.get_about_section("university")}</a></h2></h1>
<hr>
</hgroup>
<div class="course-dates">
<p>Class Starts: <span class="start-date">7/12/12</span></p>
<p>Final Exam: <span class="start-date">12/09/12</span></p>
<p>Total Length: <span class="course-length">15 weeks</span></p>
</div>
</section>
</section>
<section class="main-content-wrap">
<div class="video">
${course.get_about_section("video")}
</div>
<section class="course-description">
<h3>About this course</h3>
<div class="course-times">
<div class="start">
<strong>Start</strong>
Aug 6th
</div>
<div class="length">
<strong>Length</strong>
15 weeks
</div>
<div class="final">
<strong>Final</strong>
Dec 24th
</div>
<section class="actions">
<div class="register-wrapper">
<a href="#" class="register">Register</a>
</div>
</div>
<p>${course.get_about_section("description")}</p>
<section class="social-sharing">
<p><span class="num-people-registered">1,435</span> students already registed!</p>
</section>
</section>
</div>
</header>
<div class="faded-hr-divider"></div>
<section class="container">
<section class="details">
<nav>
<a href="#" class="active">Overview</a>
<a href="#">FAQ</a>
<a href="#">Requirements</a>
<a href="#">Text-book</a>
<a href="#">Syllabus</a>
<a href="#">Reviews</a>
</nav>
<ul class="tabs">
<li data-class="requirements" class="enabled">Requirements</li>
<li data-class="syllabus">Syllabus</li>
<li data-class="textbook">Textbook</li>
<li data-class="faq">FAQ</li>
<li data-class="more-info">More info</li>
</ul>
<div class="inner-wrapper">
<section class="about">
<h2>About this course</h2>
<p>${course.get_about_section("description")}</p>
<section class="tabs-content">
<section class="requirements tab" style="display: block;">
<h3>Requirements</h3>
${course.get_about_section("requirements")}
</section>
<h2>Requirements</h2>
<p>${course.get_about_section("requirements")}</p>
<section class="syllabus tab">
<h3>Syllabus</h3>
${course.get_about_section("syllabus")}
</section>
<h2>Syllabus</h2>
<p>${course.get_about_section("syllabus")}</p>
<section class="textbook tab">
<h3>Textbook</h3>
${course.get_about_section("textbook")}
</section>
<section class="faq tab">
<h3>Frequently Asked Questions</h3>
${course.get_about_section("faq")}
</section>
<section class="more-info tab">
${course.get_about_section("more_info")}
</section>
</section> <!-- .tabs -->
<div class="clearfix"></div>
</section> <!-- .main-content-wrap -->
</section> <!-- .course-info -->
</section> <!-- .container -->
<section class="course-staff">
<h2>Course staff</h3>
<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>
</div>
<section class="course-sidebar">
<div class="media">
<div class="hero">
<img src="${static.url('images/history.png')}" />
<div class="play-intro"></div>
</div>
<%include file="../video_modal.html" />
${course.get_about_section("video")}
</div>
<section class="course-summary">
<h3>Course Sumamry</h3>
<p>${course.get_about_section("short_description")}</p>
</section>
<section class="dates">
<p>Course Number <span class="start-date">(${course.get_about_section("number")})</span></p>
</section>
</section>
</section>
</section>
lms/templates/video_modal.html 0 → 100644
<%namespace name='static' file='static_content.html'/>
<section class="modal video-modal">
<div class="inner-wrapper">
<iframe width="640" height="360" src="http://www.youtube.com/embed/p2Q6BrNhdh8" frameborder="0" allowfullscreen></iframe>
<div class="close-modal">
<div class="inner">
<p>&#10005;</p>
</div>
</div>
</div>
</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