Skip to content

E
edx-platform
Commit 661bdd1f by Ernie Park
Options

merge

parents a0db591b f0f25997
Showing with 1501 additions and 735 deletions
.DS_Store
No preview for this file type
404.html 0 → 100644
<%inherit file="main.html" />
<section class="activation">
<h1>Page not found</h1>
<p>The page that you were looking for was not found. Go back to the <a href="/">homepage</a> or let us know about any pages that may have been moved at <a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a>.</p>
</section>
copyright.html
......@@ -7,31 +7,32 @@
<ul>
<li>
<h2>Videos and Ungraded Exercises</h2>
<p><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-sa/3.0/80x15.png" /></a><br />The videos on this page are licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-ShareAlike 3.0 Unported License</a>.</p>
</li>
<li>
<h2>Graded Exercises</h2>
<p>Graded exercises are All Rights Reserved until the due date. Past the due date, they are licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-ShareAlike 3.0 Unported License</a>.</p>
<h2>Videos and Exercises</h2>
<p> Copyright &copy; 2012 MIT. All rights reserved. In order to
further MIT's goal of making education accessible and affordable
to the world, MIT is planning to make <i>MITx</i> course content
available under open source licenses.
</p>
</li>
<li>
<h2>Textbook</h2>
<p>Textbook is All Rights Reserved Elsevier. We are using it with permission. We apologize for the inclusion of proprietary work. </p>
<p> Copyright &copy; 2005 Elsevier Inc. All Rights
Reserved. Used with permission. While our goal is to build
courses with as much free and open content as possible, we
apologize that we do not have the ability to do so
entirely. </p>
</li>
<li>
<h2>Student-generated content</h2>
<td>Due to privacy concerns, all forum posts, wiki etc, and other student-created works are All Rights Reserved until released otherwise by MIT. </td></li>
<li>
<h2>Source Code</h2>
<p>Source code is All Rights Reserved during the beta offering. We expect to release it under a free and open license shortly thereafter. </p>
</li>
<td>Copyright &copy; 2012. All Rights Reserved. Due to privacy
concerns, we do not know what portion of these will be released
under open licenses. </td></li>
</ul>
<p>MIT and MITx are trademarks of the Massachusetts Institute of Technology, and may not be used without permission.</p>
<p>MIT and <i>MITx</i> are trademarks of the Massachusetts Institute
of Technology, and may not be used without permission.</p>
</div>
</section>
honor.html
......@@ -2,12 +2,48 @@
<section class="honor-code">
<div>
<h1> Honor Code </h1>
<h1> Collaboration Policy </h1>
<ul>
<li> I agree to not engage in any activities that would dishonestly improve my results, or improve or hurt those of others.</li>
<li> I agree to never post answers to problems.</li>
<li> I agree to maintain only one account.</li>
</ul>
<p> By enrolling in a course on <i>MITx</i>, you are joining a
special worldwide community of learners. The aspiration
of <i>MITx</i> is to provide anyone in the world who has the
motivation and ability to engage MIT coursework the opportunity
to attain the best MIT-based educational experience that
Internet technology enables. You are part of the community who
will help <i>MITx</i> achieve this goal.
<p> <i>MITx</i> depends upon your motivation to learn the material
and to do so with honesty. In order to participate
in <i>MITx</i>, you must agree to the Honor Code below and any
additional terms specific to a class. This Honor Code, and any
additional terms, will be posted on each class website.
<div style="color:darkred;">
<h2> <i>MITx</i> Honor Code Pledge</h2>
<p> By enrolling in an <i>MITx</i> course, I agree that I will:
<ul>
<li> Complete all mid-terms and final exams with my own work
and only my own work. I will not submit the work of any
other person.
<li> Maintain only one user account and not let anyone else
use my username and/or password.
<li> Not engage in any activity that would dishonestly improve
my results, or improve or hurt the results of others.
<li> Not post answers to problems that are being used to
assess student performance.
</ul>
</div>
<p> Unless otherwise indicated by the instructor of an <i>MITx</i>
course, learners on <i>MITx</i> are encouraged to:
<ul>
<li> Collaborate with others on the lecture videos, exercises,
homework and labs.
<li> Discuss with others general concepts and materials in
each course.
<li> Present ideas and written work to fellow <i>MITx</i>
learners or others for comment or criticism.
</ul>
</div>
</section>
index.html
......@@ -5,9 +5,9 @@
<section>
<h1>Circuits &amp; Electronics</h1>
<h2>6.002x</h2>
<a class="enroll" rel="leanModal" href="#enroll">Enroll in 6.002 Circuits <span>&amp;</span> Electronics</a>
<a class="enroll" rel="leanModal" href="#enroll">Enroll in 6.002x Circuits <span>&amp;</span> Electronics</a>
</section>
<p> Taught by Anant Agarwal, with Gerald Sussman, Piotr Mitros, and Chris Terman, &ldquo;6.002x Circuits and Electronics&rdquo; is an experimental on-line adaption of MIT's first undergraduate analog design course 6.002. This course will run, free of charge, for students worldwide from February 21, 2012 through June&nbsp;10,&nbsp;2012.</p>
<p>6.002x (Circuits and Electronics) is an experimental on-line adaptation of MIT&rsquo;s first undergraduate analog design course: 6.002. This course will run, free of charge, for students worldwide from March 1, 2012 through June 8, 2012.</p>
</section>
</%block>
<%block name="header_class">course</%block>
......@@ -18,9 +18,9 @@
<section class="about-info">
<h1>About 6.002x</h1>
<p>6.002x is designed to serve as a first course in an undergraduate electrical engineering (EE), or electrical engineering and computer science (EECS) curriculum. At MIT, 6.002 is in the core of department subjects required for all undergraduates in EECS.</p>
<p>6.002x (Circuits and Electronics) is designed to serve as a first course in an undergraduate electrical engineering (EE), or electrical engineering and computer science (EECS) curriculum. At MIT, 6.002 is in the core of department subjects required for all undergraduates in EECS.</p>
<p>The course introduces engineering in the context of the lumped circuit abstraction. Topics covered include: resistive elements and networks; independent and dependent sources; switches and MOS transistors; digital abstraction; amplifiers; energy storage elements; dynamics of first- and second-order networks; design in the time and frequency domains; and analog and digital circuits and applications. Design and lab exercises are also significant components of the course. Students should expect to spend approximately 10 hours per week on the course. The 6.002 content was created collaboratively by Profs. Anant Agarwal and Jeffrey H. Lang.</p>
<p>The course introduces engineering in the context of the lumped circuit abstraction. Topics covered include: resistive elements and networks; independent and dependent sources; switches and MOS transistors; digital abstraction; amplifiers; energy storage elements; dynamics of first- and second-order networks; design in the time and frequency domains; and analog and digital circuits and applications. Design and lab exercises are also significant components of the course. You should expect to spend approximately 10 hours per week on the course.</p>
<!-- <p> The course uses the textbook Foundations of Analog and Digital Electronic Circuits. Agarwal, Anant, and Jeffrey H. Lang. San Mateo, CA: Morgan Kaufmann Publishers, Elsevier, July 2005. ISBN: 9781558607354. While recommended, the book is not required -- relevant section will be provided electronically as part of the on-line course.</p> -->
</section>
......@@ -28,21 +28,26 @@
<section class="on-mitx">
<h1>6.002x on <em>MITx</em></h1> <!-- Link doesn't need to be here, but there should be some way to get back to main MITx site -->
<p>Students who successfully complete the course will receive an electronic certificate of accomplishment from MIT. Since this is an experimental version of the course, the certificate will be marked as Beta.</p>
<p>If you successfully complete the course, you will receive an electronic certificate of accomplishment from <em>MITx</em>. This certificate will indicate that you earned it from <em>MITx&rsquo;s</em> pilot course. In this prototype version, <em>MITx</em> will not require that you be tested in a testing center or otherwise have your identity certified in order to receive this certificate.</p>
<p> The course uses the textbook Foundations of Analog and Digital Electronic Circuits. Agarwal, Anant, and Jeffrey H. Lang. Morgan Kaufmann Publishers, Elsevier, July 2005. ISBN: 9781558607354. While recommended, the book is not required -- relevant sections will be provided electronically as part of the on-line course. The book can be purchased on <a href="http://www.amazon.com/exec/obidos/ASIN/1558607358/ref=nosim" target="_blank">Amazon</a>. Copyright for the book is with Elsevier and the book cannot be printed etc.</p>
<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" target="_blank">Amazon</a>.</p>
</section>
<section class="requirements">
<h1> Requirements </h1>
<p>In order to succeed in this course, students must have taken an AP level physics course in electricity and magnetism. Students 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 students with weaker math backgrounds.</p>
<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 Mozilla Firefox as well. While we will attempt to make it possible to complete the course with Internet Explorer, portions of the web site functionality will be unavailable. The videos require Flash.</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 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="cta">
<a class="enroll" rel="leanModal" href="#enroll">Enroll in Circuits &amp; Electronics</a>
<a class="enroll" rel="leanModal" href="#enroll">Enroll in 6.002x Circuits &amp; Electronics</a>
</section>
</section>
......@@ -54,43 +59,20 @@
<li>
<img src="/static/staff/agarwal-mit-news-small.jpg">
<h2>Anant Agarwal</h2>
<p>The Director of MIT's Computer Science and Artificial Intelligence Laboratory. His research focus is in parallel computer architectures, and he is the founder of several successful startups. Most recently, he founded Tilera, which produces scalable multicore embedded processors. He co-author the course textbook "Foundations of Analog and Digital Electronic Circuits."</p></li>
<li>
<img src="/static/staff/cjt-small.jpg">
<h2>Chris Terman</h2>
<p>The Co-Director MIT CSAIL, and a highly regarded instructor. He is the author of JSim, an educational package for on-line circuit schematic entry and simulation, and XTutor, and on-line question-and-answer tutoring system.</p></li>
<p>Director of MIT&rsquo;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&rsquo;s Smullin and Jamieson prizes for teaching and co-authored the course textbook &ldquo;Foundations of Analog and Digital Electronic Circuits.&rdquo;</p></li>
<li>
<img src="/static/staff/gjs-small.jpg">
<h2>Gerald Sussman</h2>
<p>A Professor of Electrical Engineering at MIT. He is a well know educator in the computer science community, perhaps best know as the author of Structure and Interpretation of Computer Programs, which is universally acknowledged as one of the top ten textboooks in computer science, or 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></li>
<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></li>
<li>
<img src="/static/staff/pmitros-small.jpg">
<h2>Piotr Mitros</h2>
<p>A Research Scientist at MIT. His research focus is in finding ways to apply techniques from control systems to optimizing the learning process. Piotr 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>
<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 class="secondary"> -->
<!-- <section class="credits"> -->
<!-- <h1> Credits </h1> -->
<!-- <p> The codebase was made possible by Django, JQuery, JQueryUI, -->
<!-- MathJAX, swfobject, askbot, django-simplewiki, pyparsing, and the -->
<!-- original FancyBox. Graphic design and css started from a free template -->
<!-- from <a href="http://www.dotemplate.com/">dotemplate.com</a>, one of -->
<!-- the few, genuinely free template web sites (although you have to -->
<!-- e-mail the owner to find that out), and was heavily modified by Piotr -->
<!-- Mitros, and later, thoughtbot.</p> -->
<!-- <p> The system is running in the Amazon cloud, which allows us to hold up to anticipated loads. </p> -->
<!-- </section> -->
<!-- </div> -->
</section>
<div id="enroll" class="leanModal_box" name="enroll"><%include file="create_account.html" /></div>
......
main.html
......@@ -3,16 +3,16 @@
<head>
<%block name="title"><title>MITX 6.002</title></%block>
<link rel="stylesheet" href="/static/lib/jquery.treeview.css" type="text/css" media="all" />
<link rel="stylesheet" href="${ settings.LIB_URL }jquery.treeview.css" type="text/css" media="all" />
<link rel="stylesheet" href="/static/css/application.css" type="text/css" media="all" />
<link href="/static/css/jquery-ui-1.8.16.custom.css" rel="stylesheet" type="text/css"/>
<link href="/static/css/print.css" rel="stylesheet" type="text/css" media="print"/>
<script type="text/javascript" src="/static/lib/jquery-1.6.2.min.js"></script>
<script type="text/javascript" src="/static/lib/jquery-ui-1.8.16.custom.min.js"></script>
<script type="text/javascript" src="/static/lib//swfobject/swfobject.js"></script>
<script type="text/javascript" src="/static/lib/jquery.treeview.js"></script>
<script type="text/javascript" src="/static/lib/jquery.leanModal.min.js"></script>
<script type="text/javascript" src="${ settings.LIB_URL }jquery-1.6.2.min.js"></script>
<script type="text/javascript" src="${ settings.LIB_URL }jquery-ui-1.8.16.custom.min.js"></script>
<script type="text/javascript" src="${ settings.LIB_URL }swfobject/swfobject.js"></script>
<script type="text/javascript" src="${ settings.LIB_URL }jquery.treeview.js"></script>
<script type="text/javascript" src="${ settings.LIB_URL }jquery.leanModal.min.js"></script>
<script type="text/javascript" src="/static/js/video_player.js"></script>
<script type="text/javascript" src="/static/js/schematic.js"></script>
<script type="text/javascript" src="/static/js/cktsim.js"></script>
......@@ -27,7 +27,7 @@
displayMath: [["\\[","\\]"]]}
});
</script>
<script type="text/javascript" src="/static/lib/mathjax/MathJax.js?config=TeX-AMS_HTML-full"></script>
<script type="text/javascript" src="${ settings.LIB_URL }mathjax/MathJax.js?config=TeX-AMS_HTML-full"></script>
<script type="text/javascript">
$(function(){
......
marketing.html
......@@ -3,16 +3,19 @@
<head>
<%block name="title"><title>MITX 6.002</title></%block>
<link rel="stylesheet" href="/static/lib/jquery.treeview.css" type="text/css" media="all" />
<!--link rel="stylesheet" href="${ settings.LIB_URL }jquery.treeview.css" type="text/css" media="all" /-->
<link rel="stylesheet" href="/static/css/marketing.css" type="text/css" media="all" />
<!--[if lt IE 8]>
<link rel="stylesheet" href="/static/css/marketing-ie.css" type="text/css" media="all" />
<![endif]-->
<script type="text/javascript" src="/static/lib/jquery-1.6.2.min.js"></script>
<script type="text/javascript" src="/static/lib/jquery-ui-1.8.16.custom.min.js"></script>
<script type="text/javascript" src="${ settings.LIB_URL }jquery-1.6.2.min.js"></script>
<script type="text/javascript" src="${ settings.LIB_URL }jquery-ui-1.8.16.custom.min.js"></script>
<script type="text/javascript" src="/static/lib/jquery.leanModal.min.js"></script>
<script type="text/javascript" src="/static/lib//swfobject/swfobject.js"></script>
<script type="text/javascript" src="/static/lib/jquery.treeview.js"></script>
<script type="text/javascript" src="/static/js/video_player.js"></script>
<script type="text/javascript" src="${ settings.LIB_URL }jquery.leanModal.min.js"></script>
<!--script type="text/javascript" src="${ settings.LIB_URL }swfobject/swfobject.js"></script-->
<!--script type="text/javascript" src="${ settings.LIB_URL }jquery.treeview.js"></script-->
<!--script type="text/javascript" src="/static/js/video_player.js"></script-->
<!-- <script type="text/javascript" src="/static/js/schematic.js"></script> -->
<!--[if lt IE 9]>
......@@ -27,6 +30,34 @@
<%block name="headextra"/>
<script type="text/javascript">
function getCookie(name) {
var cookieValue = null;
if (document.cookie && document.cookie != '') {
var cookies = document.cookie.split(';');
for (var i = 0; i < cookies.length; i++) {
var cookie = jQuery.trim(cookies[i]);
// Does this cookie string begin with the name we want?
if (cookie.substring(0, name.length + 1) == (name + '=')) {
cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
break;
}
}
}
return cookieValue;
}
function postJSON(url, data, callback) {
$.ajax({type:'POST',
url: url,
dataType: 'json',
data: data,
success: callback,
headers : {'X-CSRFToken':getCookie('csrftoken')}
});
}
</script>
</head>
<body>
......@@ -35,14 +66,17 @@
<div class="anouncement-wrapper">
<%block name="header_nav">
<nav>
<h1><a href="/t/mitx_global.html">MITx</a></h1>
<h1><a href="http://mitx.mit.edu/">MITx</a></h1>
% if settings.COURSEWARE_ENABLED:
<a rel="leanModal" class="login" href="#login">Log In</a>
% endif
</nav>
</%block>
<%block name="header_text">
<section>
<h1>MITx</h1>
<h2>An MIT Education Anywhere. For free.</h2>
<h1><em>MITx</em></h1>
<h2>MIT&rsquo;s new online learning initiative</h2>
</section>
</%block>
</div>
......@@ -65,7 +99,9 @@
</div>
</footer>
% if settings.COURSEWARE_ENABLED:
<div id="login" class="leanModal_box"><%include file="login.html" /></div>
% endif
<div id="pwd_reset" class="leanModal_box"><%include file="password_reset_form.html" /></div>
<div id="reset_done" class="leanModal_box"></div>
......
mitx_global.html
......@@ -4,21 +4,20 @@
<section class="index-content">
<section class="about">
<h1><em>MITx</em> is MIT&rsquo;s online learning initiative.</h1>
<section class="intro">
<p>This learning platform will enhance the educational experience of its on-campus students, offering them online tools that supplement and enrich their classroom and laboratory experiences. It will also be host to a virtual community of learners around the world.</p>
<p>The first course offered by <em>MITx</em> in an experimental prototype form is 6.002x Circuits and Electronics. Watch this space for the next set of courses that will become available in Fall 2012.</p>
<p><em>MITx</em> will offer a portfolio of MIT courses for free to a virtual community of learners around the world. It will also enhance the educational experience of its on-campus students, offering them online tools that supplement and enrich their classroom and laboratory experiences.</p>
<p>The first <em>MITx</em> course, 6.002x (Circuits and Electronics), will be launched in an experimental prototype form. Watch this space for further upcoming courses, which will become available in Fall 2012.</p>
</section>
<section class="features">
<h2>It will offer a portfolio of MIT courses for free on an online learning platform that:</h2>
<h2><em>MIT<span>x</span></em> courses will be offered on an online learning platform that:</h2>
<ul>
<li>organizes and presents course material to enable students to learn at their own pace</li>
<li>features interactivity, online laboratories and student-to-student communication</li>
<li>allows for the individual assessment of any student&rsquo;s work and allow students who demonstrate their mastery of subjects to earn a certificate of completion awarded by <em>MITx</em></li>
<li>operates on an open-source, scalable software infrastructure in order to make it continuously improving and readily available to other educational institutions.</li>
<li>organizes and presents course material to enable students to learn worldwide</li>
<li>features interactive instruction, online laboratories and student-to-student and student-to-professor communication</li>
<li>allows for the individual assessment of any student&rsquo;s work and allows students who demonstrate their mastery of subjects to earn certificates awarded by <em>MITx</em></li>
<li>operates on an open-source, scalable software infrastructure in order to make it continuously improving and readily available to other educational institutions, such as universities and K-12 school systems.</li>
</ul>
<p><strong>Press &amp; links:</strong> <a href="http://www.boston.com/news/local/massachusetts/articles/2011/12/19/mit_to_launch_online_only_graded_courses_free_to_all/?page=full" target="_blank">Boston Globe</a>, <a href="http://www.nytimes.com/2011/12/19/education/mit-expands-free-online-courses-offering-certificates.html?_r=3&hpw=" target="_blank">New York Times</a>, <a href="http://web.mit.edu/newsoffice/2011/mitx-education-initiative-1219.html" target="_blank">MIT Press Release</a>, <a href="http://web.mit.edu/newsoffice/2011/mitx-faq-1219" target="_blank"><em>MITx</em> FAQ</a></p>
......@@ -33,10 +32,10 @@
</hgroup>
<p>
<a href="/" class="more-info">More information <span>&amp;</span> Enroll</a>
<a href="http://6002x.mitx.mit.edu/" class="more-info">More information <span>&amp;</span> Enroll</a>
</p>
<p>Taught by Anant Agarwal, with Gerald Sussman, Piotr Mitros, and Chris Terman, &ldquo;6.002 Circuits and Electronics&rdwuo; is an on-line adaption of MIT's first undergraduate analog design course. This prototype course will run, free of charge, for students worldwide from February 21, 2012 through June 10, 2012. Students will be given the opportunity to demonstrate their mastery of the material and earn a certificate from <em>MITx</em>.</p>
<p>Taught by Anant Agarwal, with Gerald Sussman and Piotr Mitros, 6.002x (Circuits and Electronics) is an on-line adaption of 6.002, MIT&rsquo;s first undergraduate analog design course. This prototype course will run, free of charge, for students worldwide from March 1, 2012 through June 8, 2012. Students will be given the opportunity to demonstrate their mastery of the material and earn a certificate from <em>MITx</em>.</p>
</section>
</section>
<script>
......
navigation.html
<div class="header-wrapper">
<header>
<h1><em>MITx</em> Circuits and Electronics</h1>
<h1><em>MITx</em></h1>
<nav>
<h2><a href="/courseware">Circuits and Electronics</a></h2>
<ul class="coursenav">
<li><a href="/info">Course Info</a></li>
<li><a href="/courseware">Courseware</a></li>
<li><a href="/info">Course Info</a></li>
<li><a href="/book">Textbook</a></li>
<li><a href="/discussion">Discussion</a></li>
<li><a href="/wiki">Wiki</a></li>
......
profile.html
......@@ -84,8 +84,10 @@ $(function() {
<!-- <div><a class="modal" href="#change_password_pop">Reset password</a></div> -->
<div id="change_password_pop">
<h2>Password reset</h2>
<p>We'll e-mail you a password reset link at ${email}. Follow the link in the email to reset your password.</p>
<h2>Password change</h2>
<p>We'll e-mail you a password reset link at ${email}. Follow
the link in the confirmation email to change your
password.</p>
<input id="id_email" type="hidden" name="email" maxlength="75" value="${email}" />
<input type="submit" id="pwd_reset_button" value="Reset Password" />
......
registration/password_reset_email.html
......@@ -3,12 +3,12 @@
{% trans "Please go to the following page and choose a new password:" %}
{% block reset_link %}
{{ protocol }}://{{ domain }}{% url 'django.contrib.auth.views.password_reset_confirm' uidb36=uid token=token %}
https://6002x.mitx.mit.edu{% url 'django.contrib.auth.views.password_reset_confirm' uidb36=uid token=token %}
{% endblock %}
{% trans "Your username, in case you've forgotten:" %} {{ user.username }}
{% trans "Thanks for using our site!" %}
{% blocktrans %}The {{ site_name }} team{% endblocktrans %}
{% blocktrans %}The MITx team{% endblocktrans %}
{% endautoescape %}
sass/_askbot-original.scss
......@@ -1205,448 +1205,451 @@ ul {
.edit-question-page .title-desc, #fmedit .title-desc, .wmd-preview .title-desc {
margin-bottom: 10px; }
.question-page {
h1 {
padding-top: 0px;
font-family: 'Yanone Kaffeesatz',sans-serif;
a {
color: #464646;
font-size: 30px;
font-weight: normal;
line-height: 1; } }
p.rss {
float: none;
clear: both;
padding: 3px 0 0 23px;
font-size: 15px;
width: 110px;
background-position: center left;
margin-left: 0px !important;
a {
font-family: 'Yanone Kaffeesatz',sans-serif;
vertical-align: top; } }
.question-content {
float: right;
width: 682px;
margin-bottom: 10px; }
#question-table {
float: left;
border-top: #f0f0f0 1px solid;
margin: 6px 0 6px 0;
border-spacing: 0px;
width: 670px;
padding-right: 10px; }
.answer-table {
margin: 6px 0 6px 0;
border-spacing: 0px;
width: 670px;
padding-right: 10px;
margin-top: 0px;
border-bottom: 1px solid #D4D4D4;
float: right;
td {
width: 20px;
vertical-align: top; } }
#question-table td {
width: 20px;
vertical-align: top; }
.question-body, .answer-body {
overflow: auto;
margin-top: 10px;
font-family: Arial;
color: #4b4b4b; }
.question-body p, .answer-body p {
margin-bottom: 14px;
line-height: 1.4;
font-size: 14px;
padding: 0px 5px 5px 0px; }
.question-body a, .answer-body a {
color: #1b79bd; }
.question-body li, .answer-body li {
margin-bottom: 7px; }
.question-body IMG, .answer-body IMG {
max-width: 600px; }
.post-update-info-container {
float: right;
width: 175px; }
.post-update-info {
background: white url(../images/background-user-info.png) repeat-x bottom;
float: right;
font-size: 9px;
font-family: Arial;
width: 158px;
padding: 4px;
margin: 0px 0px 5px 5px;
line-height: 14px;
border-radius: 4px;
-ms-border-radius: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
-khtml-border-radius: 4px;
-webkit-box-shadow: 0px 2px 1px #bfbfbf;
-moz-box-shadow: 0px 2px 1px #bfbfbf;
box-shadow: 0px 2px 1px #bfbfbf;
p {
line-height: 13px;
font-size: 11px;
margin: 0 0 2px 1px;
padding: 0; }
a {
color: #444; }
.gravatar {
float: left;
margin-right: 4px; }
p.tip {
color: #444;
line-height: 13px;
font-size: 10px; } }
.post-controls {
font-size: 11px;
line-height: 12px;
min-width: 200px;
padding-left: 5px;
text-align: right;
clear: left;
float: right;
margin-top: 10px;
margin-bottom: 8px;
a {
color: #777;
padding: 0px 3px 3px 22px;
cursor: pointer;
border: none;
font-size: 12px;
font-family: Arial;
text-decoration: none;
height: 18px;
display: block;
float: right;
line-height: 18px;
margin-top: -2px;
margin-left: 4px;
&:hover {
background-color: #f5f0c9;
border-radius: 3px;
-ms-border-radius: 3px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
-khtml-border-radius: 3px; } }
.sep {
color: #ccc;
float: right;
height: 18px;
font-size: 18px; }
.question-delete {
background: url(../images/delete.png) no-repeat center left;
padding-left: 16px; } }
.answer-controls .question-delete {
background: url(../images/delete.png) no-repeat center left;
padding-left: 16px; }
.post-controls .question-flag, .answer-controls .question-flag {
background: url(../images/flag.png) no-repeat center left; }
.post-controls .question-edit, .answer-controls .question-edit {
background: url(../images/edit2.png) no-repeat center left; }
.post-controls .question-retag, .answer-controls .question-retag {
background: url(../images/retag.png) no-repeat center left; }
.post-controls .question-close, .answer-controls .question-close {
background: url(../images/close.png) no-repeat center left; }
.post-controls .permant-link, .answer-controls .permant-link {
background: url(../images/link.png) no-repeat center left; }
.tabBar {
width: 100%; }
#questionCount {
float: left;
font-family: 'Yanone Kaffeesatz',sans-serif;
line-height: 15px; }
.question-img-upvote, .question-img-downvote, .answer-img-upvote, .answer-img-downvote {
width: 25px;
height: 20px;
cursor: pointer; }
.question-img-upvote, .answer-img-upvote {
background: url(../images/vote-arrow-up-new.png) no-repeat; }
.question-img-downvote, .answer-img-downvote {
background: url(../images/vote-arrow-down-new.png) no-repeat; }
.question-img-upvote {
&:hover, &.on {
background: url(../images/vote-arrow-up-on-new.png) no-repeat; } }
.answer-img-upvote {
&:hover, &.on {
background: url(../images/vote-arrow-up-on-new.png) no-repeat; } }
.question-img-downvote {
&:hover, &.on {
background: url(../images/vote-arrow-down-on-new.png) no-repeat; } }
.answer-img-downvote {
&:hover, &.on {
background: url(../images/vote-arrow-down-on-new.png) no-repeat; } }
#fmanswer_button {
margin: 8px 0px; }
.question-img-favorite:hover {
background: url(../images/vote-favorite-on.png); }
div.comments {
padding: 0; }
#comment-title {
font-weight: bold;
font-size: 23px;
color: #7ea9b3;
width: 200px;
float: left;
font-family: 'Yanone Kaffeesatz',sans-serif; }
.comments {
font-size: 12px;
clear: both;
div.controls {
clear: both;
float: left;
width: 100%;
margin: 3px 0 20px 5px; }
.controls a {
color: #988e4c;
padding: 0 3px 2px 22px;
font-family: Arial;
font-size: 13px;
background: url(../images/comment.png) no-repeat center left;
&:hover {
background-color: #f5f0c9;
text-decoration: none; } }
.button {
color: #988e4c;
font-size: 11px;
padding: 3px;
cursor: pointer; }
a {
background-color: inherit;
color: #1b79bd;
padding: 0; }
form.post-comments {
margin: 3px 26px 0 42px;
textarea {
font-size: 13px;
line-height: 1.3; } }
textarea {
height: 42px;
width: 100%;
margin: 7px 0 5px 1px;
font-family: Arial;
outline: none;
overflow: auto;
font-size: 12px;
line-height: 140%;
padding-left: 2px;
padding-top: 3px;
border: #cce6ec 3px solid; }
input {
margin-left: 10px;
margin-top: 1px;
vertical-align: top;
width: 100px; }
button {
background: url(../images/small-button-blue.png) repeat-x top;
border: 0;
color: #4a757f;
font-family: Arial;
font-size: 13px;
width: 100px;
font-weight: bold;
height: 27px;
line-height: 25px;
margin-bottom: 5px;
cursor: pointer;
border-radius: 4px;
-ms-border-radius: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
-khtml-border-radius: 4px;
text-shadow: 0px 1px 0px #e6f6fa;
-moz-text-shadow: 0px 1px 0px #e6f6fa;
-webkit-text-shadow: 0px 1px 0px #e6f6fa;
-webkit-box-shadow: 1px 1px 2px #808080;
-moz-box-shadow: 1px 1px 2px #808080;
box-shadow: 1px 1px 2px #808080;
&:hover {
background: url(../images/small-button-blue.png) bottom repeat-x;
text-shadow: 0px 1px 0px #c6d9dd;
-moz-text-shadow: 0px 1px 0px #c6d9dd;
-webkit-text-shadow: 0px 1px 0px #c6d9dd; } }
.counter {
display: inline-block;
width: 245px;
float: right;
color: #b6a475 !important;
vertical-align: top;
font-family: Arial;
float: right;
text-align: right; }
.comment {
border-bottom: 1px solid #edeeeb;
clear: both;
margin: 0;
margin-top: 8px;
padding-bottom: 4px;
overflow: auto;
font-family: Arial;
font-size: 11px;
min-height: 25px;
background: white url(../images/comment-background.png) bottom repeat-x;
border-radius: 5px;
-ms-border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
-khtml-border-radius: 5px; }
div.comment:hover {
background-color: #efefef; }
a.author {
background-color: inherit;
color: #1b79bd;
padding: 0;
&:hover {
text-decoration: underline; } }
span.delete-icon {
background: url(../images/close-small.png) no-repeat;
border: 0;
width: 14px;
height: 14px;
&:hover {
border: #BC564B 2px solid;
border-radius: 10px;
-ms-border-radius: 10px;
-moz-border-radius: 10px;
-webkit-border-radius: 10px;
-khtml-border-radius: 10px;
margin: -3px 0px 0px -2px; } }
.content {
margin-bottom: 7px; }
.comment-votes {
float: left;
width: 37px;
line-height: 130%;
padding: 6px 5px 6px 3px; }
.comment-body {
line-height: 1.3;
margin: 3px 26px 0 46px;
padding: 5px 3px;
color: #666;
font-size: 13px;
.edit {
padding-left: 6px; }
p {
font-size: 13px;
line-height: 1.3;
margin-bottom: 3px;
padding: 0; } }
.comment-delete {
float: right;
width: 14px;
line-height: 130%;
padding: 8px 6px; }
.upvote {
margin: 0px;
padding-right: 17px;
padding-top: 2px;
text-align: right;
height: 20px;
font-size: 13px;
font-weight: bold;
color: #777;
&.upvoted {
color: #d64000; }
&.hover {
background: url(../images/go-up-grey.png) no-repeat;
background-position: right 1px; }
&:hover {
background: url(../images/go-up-orange.png) no-repeat;
background-position: right 1px; } }
.help-text {
float: right;
text-align: right;
color: gray;
margin-bottom: 0px;
margin-top: 0px;
line-height: 50%; } }
#questionTools {
font-size: 22px;
margin-top: 11px;
text-align: left; }
.question-status {
margin-top: 10px;
margin-bottom: 15px;
padding: 20px;
background-color: #fef7cc;
text-align: center;
border: #e1c04a 1px solid;
h3 {
font-size: 20px;
color: #707070;
font-weight: normal; } }
.vote-buttons {
float: left;
text-align: center;
padding-top: 2px;
margin: 10px 10px 0px 3px;
IMG {
cursor: pointer; } }
.vote-number {
font-family: 'Yanone Kaffeesatz',sans-serif;
padding: 0px 0 5px 0;
font-size: 25px;
font-weight: bold;
color: #777; }
.vote-buttons .notify-sidebar {
text-align: left;
width: 120px;
label {
vertical-align: top; } }
.tabBar-answer {
margin-bottom: 15px;
padding-left: 7px;
width: 723px;
margin-top: 10px; }
.answer .vote-buttons {
float: left; }
.accepted-answer {
background-color: #f7fecc;
border-bottom-color: #9BD59B;
.vote-buttons {
width: 27px;
margin-right: 10px;
margin-top: 10px; } }
.answer .post-update-info a {
color: #444444; }
.answered {
background: #CCC;
color: #999; }
.answered-accepted {
background: #DCDCDC;
color: #763333;
strong {
color: #E1E818; } }
.answered-by-owner {
background: #F1F1FF;
.comments {
.button {
background-color: #E6ECFF; }
background-color: #E6ECFF; }
.vote-buttons {
margin-right: 10px; } }
.answer-img-accept:hover {
background: url(../images/vote-accepted-on.png); }
.answer-body {
a {
color: #1b79bd; }
li {
margin-bottom: 0.7em; } }
#fmanswer {
color: #707070;
line-height: 1.2;
margin-top: 10px;
h2 {
font-family: 'Yanone Kaffeesatz',sans-serif;
color: #7ea9b3;
font-size: 24px; }
label {
font-size: 13px; } }
.message {
padding: 5px;
margin: 0px 0 10px 0; } }
// .question-page {
// h1 {
// padding-top: 0px;
// font-family: 'Yanone Kaffeesatz',sans-serif;
// a {
// color: #464646;
// font-size: 30px;
// font-weight: normal;
// line-height: 1; } }
// p.rss {
// float: none;
// clear: both;
// padding: 3px 0 0 23px;
// font-size: 15px;
// width: 110px;
// background-position: center left;
// margin-left: 0px !important;
// a {
// font-family: 'Yanone Kaffeesatz',sans-serif;
// vertical-align: top; } }
// .question-content {
// float: right;
// width: 682px;
// margin-bottom: 10px; }
// #question-table {
// float: left;
// border-top: #f0f0f0 1px solid;
// margin: 6px 0 6px 0;
// border-spacing: 0px;
// width: 670px;
// padding-right: 10px; }
// .answer-table {
// margin: 6px 0 6px 0;
// border-spacing: 0px;
// width: 670px;
// padding-right: 10px;
// margin-top: 0px;
// border-bottom: 1px solid #D4D4D4;
// float: right;
// td {
// width: 20px;
// vertical-align: top; } }
// #question-table td {
// width: 20px;
// vertical-align: top; }
// .question-body, .answer-body {
// overflow: auto;
// margin-top: 10px;
// font-family: Arial;
// color: #4b4b4b; }
// .question-body p, .answer-body p {
// margin-bottom: 14px;
// line-height: 1.4;
// font-size: 14px;
// padding: 0px 5px 5px 0px; }
// .question-body a, .answer-body a {
// color: #1b79bd; }
// .question-body li, .answer-body li {
// margin-bottom: 7px; }
// .question-body IMG, .answer-body IMG {
// max-width: 600px; }
// .post-update-info-container {
// float: right;
// width: 175px; }
// .post-update-info {
// background: white url(../images/background-user-info.png) repeat-x bottom;
// float: right;
// font-size: 9px;
// font-family: Arial;
// width: 158px;
// padding: 4px;
// margin: 0px 0px 5px 5px;
// line-height: 14px;
// border-radius: 4px;
// -ms-border-radius: 4px;
// -moz-border-radius: 4px;
// -webkit-border-radius: 4px;
// -khtml-border-radius: 4px;
// -webkit-box-shadow: 0px 2px 1px #bfbfbf;
// -moz-box-shadow: 0px 2px 1px #bfbfbf;
// box-shadow: 0px 2px 1px #bfbfbf;
// p {
// line-height: 13px;
// font-size: 11px;
// margin: 0 0 2px 1px;
// padding: 0; }
// a {
// color: #444; }
// .gravatar {
// float: left;
// margin-right: 4px; }
// p.tip {
// color: #444;
// line-height: 13px;
// font-size: 10px; } }
// .post-controls {
// font-size: 11px;
// line-height: 12px;
// min-width: 200px;
// padding-left: 5px;
// text-align: right;
// clear: left;
// float: right;
// margin-top: 10px;
// margin-bottom: 8px;
// a {
// color: #777;
// padding: 0px 3px 3px 22px;
// cursor: pointer;
// border: none;
// font-size: 12px;
// font-family: Arial;
// text-decoration: none;
// height: 18px;
// display: block;
// float: right;
// line-height: 18px;
// margin-top: -2px;
// margin-left: 4px;
// &:hover {
// background-color: #f5f0c9;
// border-radius: 3px;
// -ms-border-radius: 3px;
// -moz-border-radius: 3px;
// -webkit-border-radius: 3px;
// -khtml-border-radius: 3px; } }
// .sep {
// color: #ccc;
// float: right;
// height: 18px;
// font-size: 18px; }
// .question-delete {
// background: url(../images/delete.png) no-repeat center left;
// padding-left: 16px; } }
// .answer-controls .question-delete {
// background: url(../images/delete.png) no-repeat center left;
// padding-left: 16px; }
// .post-controls .question-flag, .answer-controls .question-flag {
// background: url(../images/flag.png) no-repeat center left; }
// .post-controls .question-edit, .answer-controls .question-edit {
// background: url(../images/edit2.png) no-repeat center left; }
// .post-controls .question-retag, .answer-controls .question-retag {
// background: url(../images/retag.png) no-repeat center left; }
// .post-controls .question-close, .answer-controls .question-close {
// background: url(../images/close.png) no-repeat center left; }
// .post-controls .permant-link, .answer-controls .permant-link {
// background: url(../images/link.png) no-repeat center left; }
// .tabBar {
// width: 100%; }
// #questionCount {
// float: left;
// font-family: 'Yanone Kaffeesatz',sans-serif;
// line-height: 15px; }
// .question-img-upvote, .question-img-downvote, .answer-img-upvote, .answer-img-downvote {
// width: 25px;
// height: 20px;
// cursor: pointer; }
// .question-img-upvote, .answer-img-upvote {
// background: url(../images/vote-arrow-up-new.png) no-repeat; }
// .question-img-downvote, .answer-img-downvote {
// background: url(../images/vote-arrow-down-new.png) no-repeat; }
// .question-img-upvote {
// &:hover, &.on {
// background: url(../images/vote-arrow-up-on-new.png) no-repeat; } }
// .answer-img-upvote {
// &:hover, &.on {
// background: url(../images/vote-arrow-up-on-new.png) no-repeat; } }
// .question-img-downvote {
// &:hover, &.on {
// background: url(../images/vote-arrow-down-on-new.png) no-repeat; } }
// .answer-img-downvote {
// &:hover, &.on {
// background: url(../images/vote-arrow-down-on-new.png) no-repeat; } }
// #fmanswer_button {
// margin: 8px 0px; }
// .question-img-favorite:hover {
// background: url(../images/vote-favorite-on.png); }
// div.comments {
// padding: 0; }
// #comment-title {
// font-weight: bold;
// font-size: 23px;
// color: #7ea9b3;
// width: 200px;
// float: left;
// font-family: 'Yanone Kaffeesatz',sans-serif; }
// .comments {
// font-size: 12px;
// clear: both;
// div.controls {
// clear: both;
// float: left;
// width: 100%;
// margin: 3px 0 20px 5px; }
// .controls a {
// color: #988e4c;
// padding: 0 3px 2px 22px;
// font-family: Arial;
// font-size: 13px;
// background: url(../images/comment.png) no-repeat center left;
// &:hover {
// background-color: #f5f0c9;
// text-decoration: none; } }
// .button {
// color: #988e4c;
// font-size: 11px;
// padding: 3px;
// cursor: pointer; }
// a {
// background-color: inherit;
// color: #1b79bd;
// padding: 0; }
// form.post-comments {
// margin: 3px 26px 0 42px;
// textarea {
// font-size: 13px;
// line-height: 1.3; } }
// textarea {
// height: 42px;
// width: 100%;
// margin: 7px 0 5px 1px;
// font-family: Arial;
// outline: none;
// overflow: auto;
// font-size: 12px;
// line-height: 140%;
// padding-left: 2px;
// padding-top: 3px;
// border: #cce6ec 3px solid; }
// input {
// margin-left: 10px;
// margin-top: 1px;
// vertical-align: top;
// width: 100px; }
// button {
// background: url(../images/small-button-blue.png) repeat-x top;
// border: 0;
// color: #4a757f;
// font-family: Arial;
// font-size: 13px;
// width: 100px;
// font-weight: bold;
// height: 27px;
// line-height: 25px;
// margin-bottom: 5px;
// cursor: pointer;
// border-radius: 4px;
// -ms-border-radius: 4px;
// -moz-border-radius: 4px;
// -webkit-border-radius: 4px;
// -khtml-border-radius: 4px;
// text-shadow: 0px 1px 0px #e6f6fa;
// -moz-text-shadow: 0px 1px 0px #e6f6fa;
// -webkit-text-shadow: 0px 1px 0px #e6f6fa;
// -webkit-box-shadow: 1px 1px 2px #808080;
// -moz-box-shadow: 1px 1px 2px #808080;
// box-shadow: 1px 1px 2px #808080;
// &:hover {
// background: url(../images/small-button-blue.png) bottom repeat-x;
// text-shadow: 0px 1px 0px #c6d9dd;
// -moz-text-shadow: 0px 1px 0px #c6d9dd;
// -webkit-text-shadow: 0px 1px 0px #c6d9dd; } }
// .counter {
// display: inline-block;
// width: 245px;
// float: right;
// color: #b6a475 !important;
// vertical-align: top;
// font-family: Arial;
// float: right;
// text-align: right; }
// .comment {
// border-bottom: 1px solid #edeeeb;
// clear: both;
// margin: 0;
// margin-top: 8px;
// padding-bottom: 4px;
// overflow: auto;
// font-family: Arial;
// font-size: 11px;
// min-height: 25px;
// background: white url(../images/comment-background.png) bottom repeat-x;
// border-radius: 5px;
// -ms-border-radius: 5px;
// -moz-border-radius: 5px;
// -webkit-border-radius: 5px;
// -khtml-border-radius: 5px; }
// div.comment:hover {
// background-color: #efefef; }
// a.author {
// background-color: inherit;
// color: #1b79bd;
// padding: 0;
// &:hover {
// text-decoration: underline; } }
// span.delete-icon {
// background: url(../images/close-small.png) no-repeat;
// border: 0;
// width: 14px;
// height: 14px;
// &:hover {
// border: #BC564B 2px solid;
// border-radius: 10px;
// -ms-border-radius: 10px;
// -moz-border-radius: 10px;
// -webkit-border-radius: 10px;
// -khtml-border-radius: 10px;
// margin: -3px 0px 0px -2px; } }
// .content {
// margin-bottom: 7px; }
// .comment-votes {
// float: left;
// width: 37px;
// line-height: 130%;
// padding: 6px 5px 6px 3px; }
// .comment-body {
// line-height: 1.3;
// margin: 3px 26px 0 46px;
// padding: 5px 3px;
// color: #666;
// font-size: 13px;
// .edit {
// padding-left: 6px; }
// p {
// font-size: 13px;
// line-height: 1.3;
// margin-bottom: 3px;
// padding: 0; } }
// .comment-delete {
// float: right;
// width: 14px;
// line-height: 130%;
// padding: 8px 6px; }
// .upvote {
// margin: 0px;
// padding-right: 17px;
// padding-top: 2px;
// text-align: right;
// height: 20px;
// font-size: 13px;
// font-weight: bold;
// color: #777;
// &.upvoted {
// color: #d64000; }
// &.hover {
// background: url(../images/go-up-grey.png) no-repeat;
// background-position: right 1px; }
// &:hover {
// background: url(../images/go-up-orange.png) no-repeat;
// background-position: right 1px; } }
// .help-text {
// float: right;
// text-align: right;
// color: gray;
// margin-bottom: 0px;
// margin-top: 0px;
// line-height: 50%; } }
// #questionTools {
// font-size: 22px;
// margin-top: 11px;
// text-align: left; }
// .question-status {
// margin-top: 10px;
// margin-bottom: 15px;
// padding: 20px;
// background-color: #fef7cc;
// text-align: center;
// border: #e1c04a 1px solid;
// h3 {
// font-size: 20px;
// color: #707070;
// font-weight: normal; } }
// .vote-buttons {
// // float: left;
// // text-align: center;
// // padding-top: 2px;
// // margin: 10px 10px 0px 3px;
// IMG {
// cursor: pointer; } }
// .vote-number {
// font-family: 'Yanone Kaffeesatz',sans-serif;
// padding: 0px 0 5px 0;
// font-size: 25px;
// font-weight: bold;
// color: #777; }
// .vote-buttons .notify-sidebar {
// // text-align: left;
// // width: 120px;
// label {
// vertical-align: top; } }
// .tabBar-answer {
// margin-bottom: 15px;
// padding-left: 7px;
// width: 723px;
// margin-top: 10px; }
// .answer .vote-buttons {
// // float: left;
// }
// .accepted-answer {
// background-color: #f7fecc;
// border-bottom-color: #9BD59B;
// // .vote-buttons {
// // width: 27px;
// // margin-right: 10px;
// // margin-top: 10px; }
// }
// .answer .post-update-info a {
// color: #444444; }
// .answered {
// background: #CCC;
// color: #999; }
// .answered-accepted {
// background: #DCDCDC;
// color: #763333;
// strong {
// color: #E1E818; } }
// .answered-by-owner {
// background: #F1F1FF;
// .comments {
// .button {
// background-color: #E6ECFF; }
// background-color: #E6ECFF; }
// // .vote-buttons {
// // margin-right: 10px; }
// }
// .answer-img-accept:hover {
// background: url(../images/vote-accepted-on.png); }
// .answer-body {
// a {
// color: #1b79bd; }
// li {
// margin-bottom: 0.7em; } }
// #fmanswer {
// color: #707070;
// line-height: 1.2;
// margin-top: 10px;
// h2 {
// font-family: 'Yanone Kaffeesatz',sans-serif;
// color: #7ea9b3;
// font-size: 24px; }
// label {
// font-size: 13px; } }
// .message {
// padding: 5px;
// margin: 0px 0 10px 0; } }
@media screen and (-webkit-min-device-pixel-ratio:0) {
textarea {
......@@ -2704,4 +2707,3 @@ pre.prettyprint {
// color: #404; }
// .atv {
// color: #060; } }
sass/_base-extends.scss
......@@ -109,18 +109,24 @@
@extend .clearfix;
a {
@include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%));
background: darken(#F6EFD4, 5%);
border-left: 1px solid darken(#f6efd4, 20%);
color: darken(#F6EFD4, 80%);
padding: lh(.75);
text-transform: uppercase;
display: block;
&:hover {
color: darken(#F6EFD4, 60%);
text-decoration: none;
background: none;
}
&.block-link {
@include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%));
background: darken(#F6EFD4, 5%);
border-left: 1px solid darken(#f6efd4, 20%);
padding: lh(.75);
text-transform: uppercase;
display: block;
&:hover {
background: none;
}
}
}
}
sass/_base-variables.scss
......@@ -24,7 +24,7 @@
// ---------------------------------------- //
// fonts
$body-font-family: "Droid Sans", "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;;
$body-font-family: "Open Sans", "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;;
$body-font-size: 14px;
// grid
......
sass/_base.scss
......@@ -2,6 +2,12 @@
outline-color: #ccc;
}
h1, h2, h3, h4, h5, h6 {
a {
color: #000;
}
}
h1 {
font-size:1.6em;
margin:20px 0 10px 0;
......@@ -21,7 +27,6 @@ p {
em {
font-style: italic;
font-family: Georgia, serif;
}
#{$all-text-inputs}, textarea {
......
sass/_courseware-video.scss
......@@ -3,7 +3,6 @@ section.course-content {
div.video-wrapper {
float: left;
width: flex-grid(6, 9);
margin-right: flex-gutter(9);
div.video-player {
......@@ -32,40 +31,112 @@ section.course-content {
}
}
section {
ul {
display: inline-block;
// ul {
// float: left;
// li {
// margin-top: 5px;
// display: inline-block;
// cursor: pointer;
// border: 0;
// padding: 0;
// div {
// &:empty {
// display: none;
// }
// }
// }
// }
section.video-controls {
@extend .clearfix;
background: #333;
border: 1px solid #000;
color: #ccc;
li {
margin-top: 5px;
display: inline-block;
cursor: pointer;
div#slider {
@extend .clearfix;
@include border-radius(0);
@include box-shadow(inset 0 1px 0 #eee, 0 1px 0 #555);
background: #c2c2c2;
border: none;
border-bottom: 1px solid #000;
height: 20px;
a.ui-slider-handle {
@include border-radius(0);
background: $mit-red url(/static/images/slider-handle.png) center center no-repeat;
border: 0;
padding: 0;
border-right: 1px solid darken($mit-red, 20%);
border-left: 1px solid darken($mit-red, 20%);
cursor: pointer;
height: 20px;
margin: 0;
top: 0;
width: 20px;
}
}
ul.vcr {
float: left;
margin-right: lh();
div {
&:empty {
display: none;
li {
float: left;
a {
@include box-shadow(1px 0 0 #555);
border-right: 1px solid #000;
display: block;
cursor: pointer;
height: 14px;
padding: lh(.75) lh();
text-indent: -9999px;
width: 14px;
&.play {
background: url('/static/images/play-icon.png') center center no-repeat;
&:hover {
background-color: #444;
}
}
&.pause {
background: url('/static/images/pause-icon.png') center center no-repeat;
&:hover {
background-color: #444;
}
}
}
}
}
div#slider {
margin: -14px 0 10px 60px;
}
div#vidtime {
float: left;
font-weight: bold;
line-height: 46px; //height of play pause buttons
-webkit-font-smoothing: antialiased;
}
div#video_speeds {
div.speeds {
float: right;
cursor: pointer;
line-height: 46px; //height of play pause buttons
margin-right: lh();
-webkit-font-smoothing: antialiased;
div#video_speeds {
@include inline-block();
font-weight: bold;
span {
&:hover {
color: $mit-red;
span {
cursor: pointer;
&:hover {
color: $mit-red;
}
}
}
}
......@@ -75,6 +146,7 @@ section.course-content {
ol.subtitles {
float: left;
width: flex-grid(3, 9);
min-height: 570px;
li {
margin-bottom: 0px;
......
sass/_courseware.scss
......@@ -65,6 +65,7 @@ div.course-wrapper {
text-decoration: none;
margin-bottom: lh(.5);
display: block;
color: #000;
&:hover {
color: #666;
......@@ -111,6 +112,10 @@ div.course-wrapper {
margin-bottom: $body-line-height;
@extend .topbar;
a {
@extend .block-link;
}
li {
border: none;
cursor: pointer;
......@@ -160,7 +165,7 @@ div.course-wrapper {
&.seq_video_visited {
width: 14px;
background: shade(#F6EFD4, 4%) url('/static/images/video-icon.png') -64px 15px no-repeat;
background: shade(#F6EFD4, 4%) url('/static/images/video-icon.png') -81px 15px no-repeat;
&:hover {
background-color: #F6EFD4;
}
......@@ -168,7 +173,7 @@ div.course-wrapper {
&.seq_video_active {
width: 14px;
background: #FFFBEB url('/static/images/video-icon.png') -25px 15px no-repeat;
background: #FFFBEB url('/static/images/video-icon.png') -32px 15px no-repeat;
@include box-shadow(inset -1px 0 0 darken(#F6EFD4, 20%),inset 1px 0 0 darken(#F6EFD4, 20%));
&:hover {
background-color: #F6EFD4;
......
sass/_discussion-questions.scss
......@@ -74,10 +74,6 @@ ul.question-list {
font-weight: normal;
margin: 0px 0 15px 0;
text-transform: none;
a {
color: #000;
}
}
div.user-info {
......@@ -158,3 +154,41 @@ div.search-tips {
.search-result-summary {
}
div.post-update-info {
@include box-sizing(border-box);
@include border-radius(5px);
background:lighten(#F6EFD4, 5%);
padding: 10px;
a {
color:$mit-red ;
}
div.change-date {
font-size: 12px;
margin-bottom: 10px;
}
div.avatar {
display: inline-block;
float: left;
margin-right: 3px;
img.gravatar {
background: white;
border: 1px solid darken(#F6EFD4, 10%);
margin-right: 5px;
padding: 3px ;
vertical-align: bottom;
}
}
div.user-meta {
display: inline-block;
width: 60%;
span.user-badges {
display: block;
}
}
}
sass/_discussion-tags.scss
......@@ -10,13 +10,13 @@ ul.tags {
display: inline;
font-size: 12px;
margin-left: 15px;
padding: 5px 10px 5px 5px;
padding: 3px 10px 5px 5px;
&:before {
content:"";
position:absolute;
top:0;
left:-12px;
left:-11px;
width:0;
height:0;
border-color:transparent #eee transparent transparent;
......
sass/_font-face.scss
/* Generated by Font Squirrel (http://www.fontsquirrel.com) on January 25, 2012 05:06:34 PM America/New_York */
// Not used in UI
// @font-face {
// font-family: 'Open Sans';
// src: url('/static/fonts/OpenSans-Light-webfont.eot');
// src: url('/static/fonts/OpenSans-Light-webfont.eot?#iefix') format('embedded-opentype'),
// url('/static/fonts/OpenSans-Light-webfont.woff') format('woff'),
// url('/static/fonts/OpenSans-Light-webfont.ttf') format('truetype'),
// url('/static/fonts/OpenSans-Light-webfont.svg#OpenSansLight') format('svg');
// font-weight: 300;
// font-style: normal;
// }
// @font-face {
// font-family: 'Open Sans';
// src: url('/static/fonts/OpenSans-LightItalic-webfont.eot');
// src: url('/static/fonts/OpenSans-LightItalic-webfont.eot?#iefix') format('embedded-opentype'),
// url('/static/fonts/OpenSans-LightItalic-webfont.woff') format('woff'),
// url('/static/fonts/OpenSans-LightItalic-webfont.ttf') format('truetype'),
// url('/static/fonts/OpenSans-LightItalic-webfont.svg#OpenSansLightItalic') format('svg');
// font-weight: 300;
// font-style: italic;
// }
@font-face {
font-family: 'Droid Sans';
font-style: normal;
font-weight: normal;
src: local('Droid Sans'), local('DroidSans'), url('http://themes.googleusercontent.com/static/fonts/droidsans/v3/s-BiyweUPV0v-yRb-cjciL3hpw3pgy2gAi-Ip7WPMi0.woff') format('woff');
font-family: 'Open Sans';
src: url('/static/fonts/OpenSans-Regular-webfont.eot');
src: url('/static/fonts/OpenSans-Regular-webfont.eot?#iefix') format('embedded-opentype'),
url('/static/fonts/OpenSans-Regular-webfont.woff') format('woff'),
url('/static/fonts/OpenSans-Regular-webfont.ttf') format('truetype'),
url('/static/fonts/OpenSans-Regular-webfont.svg#OpenSansRegular') format('svg');
font-weight: 600;
font-style: normal;
}
@font-face {
font-family: 'Droid Sans';
font-style: normal;
font-weight: bold;
src: local('Droid Sans Bold'), local('DroidSans-Bold'), url('http://themes.googleusercontent.com/static/fonts/droidsans/v3/EFpQQyG9GqCrobXxL-KRMXbFhgvWbfSbdVg11QabG8w.woff') format('woff');
font-family: 'Open Sans';
src: url('/static/fonts/OpenSans-Italic-webfont.eot');
src: url('/static/fonts/OpenSans-Italic-webfont.eot?#iefix') format('embedded-opentype'),
url('/static/fonts/OpenSans-Italic-webfont.woff') format('woff'),
url('/static/fonts/OpenSans-Italic-webfont.ttf') format('truetype'),
url('/static/fonts/OpenSans-Italic-webfont.svg#OpenSansItalic') format('svg');
font-weight: 400;
font-style: italic;
}
// Not used in UI
// @font-face {
// font-family: 'Open Sans';
// src: url('/static/fonts/OpenSans-Semibold-webfont.eot');
// src: url('/static/fonts/OpenSans-Semibold-webfont.eot?#iefix') format('embedded-opentype'),
// url('/static/fonts/OpenSans-Semibold-webfont.woff') format('woff'),
// url('/static/fonts/OpenSans-Semibold-webfont.ttf') format('truetype'),
// url('/static/fonts/OpenSans-Semibold-webfont.svg#OpenSansSemibold') format('svg');
// font-weight: 600;
// font-style: normal;
// }
// @font-face {
// font-family: 'Open Sans';
// src: url('/static/fonts/OpenSans-SemiboldItalic-webfont.eot');
// src: url('/static/fonts/OpenSans-SemiboldItalic-webfont.eot?#iefix') format('embedded-opentype'),
// url('/static/fonts/OpenSans-SemiboldItalic-webfont.woff') format('woff'),
// url('/static/fonts/OpenSans-SemiboldItalic-webfont.ttf') format('truetype'),
// url('/static/fonts/OpenSans-SemiboldItalic-webfont.svg#OpenSansSemiboldItalic') format('svg');
// font-weight: 600;
// font-style: italic;
// }
@font-face {
font-family: 'Open Sans';
src: url('/static/fonts/OpenSans-Bold-webfont.eot');
src: url('/static/fonts/OpenSans-Bold-webfont.eot?#iefix') format('embedded-opentype'),
url('/static/fonts/OpenSans-Bold-webfont.woff') format('woff'),
url('/static/fonts/OpenSans-Bold-webfont.ttf') format('truetype'),
url('/static/fonts/OpenSans-Bold-webfont.svg#OpenSansBold') format('svg');
font-weight: 700;
font-style: normal;
}
@font-face {
font-family: 'Open Sans';
src: url('/static/fonts/OpenSans-BoldItalic-webfont.eot');
src: url('/static/fonts/OpenSans-BoldItalic-webfont.eot?#iefix') format('embedded-opentype'),
url('/static/fonts/OpenSans-BoldItalic-webfont.woff') format('woff'),
url('/static/fonts/OpenSans-BoldItalic-webfont.ttf') format('truetype'),
url('/static/fonts/OpenSans-BoldItalic-webfont.svg#OpenSansBoldItalic') format('svg');
font-weight: 700;
font-style: italic;
}
@font-face {
font-family: 'Open Sans';
src: url('/static/fonts/OpenSans-ExtraBold-webfont.eot');
src: url('/static/fonts/OpenSans-ExtraBold-webfont.eot?#iefix') format('embedded-opentype'),
url('/static/fonts/OpenSans-ExtraBold-webfont.woff') format('woff'),
url('/static/fonts/OpenSans-ExtraBold-webfont.ttf') format('truetype'),
url('/static/fonts/OpenSans-ExtraBold-webfont.svg#OpenSansExtrabold') format('svg');
font-weight: 800;
font-style: normal;
}
@font-face {
font-family: 'Open Sans';
src: url('/static/fonts/OpenSans-ExtraBoldItalic-webfont.eot');
src: url('/static/fonts/OpenSans-ExtraBoldItalic-webfont.eot?#iefix') format('embedded-opentype'),
url('/static/fonts/OpenSans-ExtraBoldItalic-webfont.woff') format('woff'),
url('/static/fonts/OpenSans-ExtraBoldItalic-webfont.ttf') format('truetype'),
url('/static/fonts/OpenSans-ExtraBoldItalic-webfont.svg#OpenSansExtraboldItalic') format('svg');
font-weight: 800;
font-style: italic;
}
sass/_index-extends.scss 0 → 100644
.wrapper {
@include box-sizing(border-box);
margin: 0 auto;
max-width: $fg-max-width;
min-width: $fg-min-width;
padding: lh();
width: flex-grid(12);
}
.subpage {
@extend .clearfix;
@extend .wrapper;
> div {
padding-left: flex-grid(4) + flex-gutter();
p {
margin-bottom: lh();
}
h1 {
margin-bottom: lh(.5);
}
h2 {
font: 18px $header-font-family;
color: #000;
margin-bottom: lh(.5);
}
ul {
list-style: disc outside none;
li {
list-style: disc outside none;
}
}
}
}
.clearfix:after {
content: ".";
display: block;
height: 0;
clear: both;
visibility: hidden;
}
.button {
@include border-radius(3px);
@include border-radius(3px);
@include inline-block();
@include transition();
background-color: $mit-red;
color: #fff;
margin: lh() 0 lh(.5);
padding: lh(.25) lh(.5);
text-decoration: none;
font-style: normal;
-webkit-font-smoothing: antialiased;
&:hover {
background-color: darken($mit-red, 10%);
}
span {
font-family: Garamond, Baskerville, "Baskerville Old Face", "Hoefler Text", "Times New Roman", serif;
font-style: italic;
}
}
sass/_index-variables.scss
......@@ -25,5 +25,5 @@ $header-font-family: "Open Sans", Helvetica, Arial, sans-serif;
$lh: golden-ratio($body-font-size, 1);
// Colors
$mit-red: #990000;
$mit-red: #933;
$cream: #F6EFD4;
sass/_index.scss
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 400;
src: local('Open Sans'), local('OpenSans'), url('http://themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3bO3LdcAZYWl9Si6vvxL-qU.woff') format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: italic;
font-weight: 400;
src: local('Open Sans Italic'), local('OpenSans-Italic'), url('http://themes.googleusercontent.com/static/fonts/opensans/v6/xjAJXh38I15wypJXxuGMBrrIa-7acMAeDBVuclsi6Gc.woff') format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 800;
src: local('Open Sans Extrabold'), local('OpenSans-Extrabold'), url('http://themes.googleusercontent.com/static/fonts/opensans/v6/EInbV5DfGHOiMmvb1Xr-hqRDOzjiPcYnFooOUGCOsRk.woff') format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: italic;
font-weight: 800;
src: local('Open Sans Extrabold Italic'), local('OpenSans-ExtraboldItalic'), url('http://themes.googleusercontent.com/static/fonts/opensans/v6/PRmiXeptR36kaC0GEAetxsBo4hlZyBvkZICS3KpNonM.woff') format('woff');
}
// Extends
//---------------------------------------- //
.wrapper {
@include box-sizing(border-box);
margin: 0 auto;
max-width: $fg-max-width;
min-width: $fg-min-width;
padding: lh();
width: flex-grid(12);
}
.subpage {
@extend .clearfix;
@extend .wrapper;
> div {
padding-left: flex-grid(4) + flex-gutter();
p {
margin-bottom: lh();
}
h1 {
margin-bottom: lh(.5);
}
h2 {
font: 18px $header-font-family;
color: #000;
margin-bottom: lh(.5);
}
ul {
list-style: disc outside none;
li {
list-style: disc outside none;
}
}
}
}
.clearfix:after {
content: ".";
display: block;
height: 0;
clear: both;
visibility: hidden;
}
.button {
@include border-radius(3px);
@include border-radius(3px);
@include inline-block();
@include transition();
background-color: $mit-red;
color: #fff;
margin: lh() 0 lh(.5);
padding: lh(.25) lh(.5);
text-decoration: none;
font-style: normal;
-webkit-font-smoothing: antialiased;
&:hover {
background-color: darken($mit-red, 10%);
}
span {
font-family: Garamond, Baskerville, "Baskerville Old Face", "Hoefler Text", "Times New Roman", serif;
font-style: italic;
}
}
body {
background-color: #fff;
color: #444;
......@@ -144,17 +44,17 @@ body {
}
header.announcement {
// @include background-size(cover);
@include background-size(cover);
background: #333;
border-bottom: 1px solid #000;
color: #fff;
-webkit-font-smoothing: antialiased;
&.home {
background: #e3e3e3 url("/static/images/marketing/shot-1-medium.jpg");
background: #e3e3e3 url("/static/images/marketing/shot-5-medium.jpg");
@media screen and (min-width: 1200px) {
background: #e3e3e3 url("/static/images/marketing/shot-1-large.jpg");
background: #e3e3e3 url("/static/images/marketing/shot-5-large.jpg");
}
// @media screen and (max-width: 1199px) {
......@@ -347,6 +247,10 @@ section.index-content {
letter-spacing: 1px;
color: #666;
margin-bottom: lh();
span {
text-transform: none;
}
}
p {
......@@ -454,7 +358,7 @@ section.index-content {
&.requirements {
clear: both;
width: auto;
width: 100%;
border-top: 1px solid #E5E5E5;
padding-top: lh();
margin-bottom: 0;
......
sass/_layout.scss
......@@ -6,12 +6,13 @@ html {
font: $body-font-size $body-font-family;
text-align: center;
margin: 0;
background: #f3f3f3;
background: #f6f6f6;
div.header-wrapper {
@include box-shadow(inset 0 1px 0 lighten($mit-red, 10%), 0 1px 1px #ccc);
@include linear-gradient(lighten($mit-red, 5%), darken($mit-red, 5%));
border-bottom: 1px solid darken($mit-red, 10%);
// @include linear-gradient(lighten($mit-red, 5%), darken($mit-red, 5%));
@include box-shadow(inset 0 -1px 2px darken($mit-red, 10%));
background: $mit-red;
border-bottom: 1px solid #fff;
header {
@extend .clearfix;
......@@ -21,37 +22,53 @@ html {
h1 {
border-right: 1px solid darken($mit-red, 5%);
font-size: $body-font-size;
font-weight: bold;
margin: 0 $gw-gutter 0 0;
padding: 15px $gw-gutter 15px 0;
color: #000;
display: block;
float: left;
color: #000;
font-size: 20px;
font-weight: 800;
margin: 0 lh() 0 0;
padding: 17px lh() 17px 0;
text-shadow: 0 1px 0 lighten($mit-red, 10%);
em {
@include inline-block();
padding-right: lh();
}
line-height: lh();
}
nav {
float: left;
display: block;
margin: 0;
padding: 0;
text-shadow: 0 -1px 0 darken($mit-red, 10%);
-webkit-font-smoothing: antialiased;
h2 {
float: left;
margin: 0 lh() 0 0;
padding: 19px lh() 12px 0;
line-height: lh();
border-right: 1px solid darken($mit-red, 5%);
a {
color: #fff;
&:hover {
color: rgba(#fff, .7);
text-decoration: none;
}
}
}
ul {
@extend .clearfix;
display: inline-block;
padding: 15px 0;
padding: 19px 0 12px;
margin: 0;
li {
margin-right: lh();
display: inline-block;
margin-bottom: 0;
line-height: lh();
a {
color: #fff;
......@@ -71,11 +88,16 @@ html {
section.main-content {
@extend .clearfix;
@extend .wrapper;
@include box-shadow(0 1px 0 #fff);
@include box-shadow(0 0 4px #ddd);
@include box-sizing(border-box);
background: #fff;
border: 1px solid #ccc;
border-top: 0;
border-bottom: 1px solid #bbb;
@media screen and (min-width: 1400px) {
margin-top: lh(.5);
@include border-radius(3px);
border: 1px solid #bbb;
}
}
img {
......
sass/_question-view.scss 0 → 100644
div.question-header {
div.vote-buttons {
display: inline-block;
float: left;
width: flex-grid(1,9);
margin-right: flex-gutter(9);
ul li {
background-position: center;
background-repeat: no-repeat;
cursor: pointer;
font-weight: bold;
height: 20px;
list-style: none;
padding: 10px;
text-align: center;
width: 25px;
&.question-img-upvote, &.answer-img-upvote {
background-image: url(/static/images/askbot/vote-arrow-up-new.png);
background-color: #F6EFD4;
&:hover, &.on {
background-image: url(/static/images/askbot/vote-arrow-up-on-new.png);
}
}
&.question-img-downvote, &.answer-img-downvote {
background-image: url(/static/images/askbot/vote-arrow-down-new.png);
&:hover, &.on {
background-image: url(/static/images/askbot/vote-arrow-down-on-new.png);
}
}
}
}
div.question-container {
display: inline-block;
float: left;
width: flex-grid(8,9);
h1 {
margin-top: 0;
}
div.meta-bar {
border-bottom: 1px solid #eee;
display: block;
margin: 20px 0 10px;
overflow: hidden;
padding-bottom: 15px;
div.tag-list {
display: inline-block;
float:left;
width: flex-grid(4,8);
margin-right: flex-gutter(8);
}
div.question-actions {
display: inline-block;
float:left;
text-align: right;
width: flex-grid(4,8);
a {
color: darken(#F6EFD4, 50%);
&.question-delete {
color: $mit-red;
}
}
span.sep {
color: darken(#F6EFD4, 10%);
}
}
}
div.question-content {
overflow: hidden;
div.question-body {
display: inline-block;
float: left;
margin-right: flex-gutter(8);
width: flex-grid(6.2,8);
}
div.post-update-info {
display: inline-block;
float: left;
width: flex-grid(1.8,8);
}
}
}
}
sass/_textbook.scss
......@@ -4,13 +4,39 @@ div.book-wrapper {
ul#booknav {
@extend .sidebar;
@include box-sizing(border-box);
padding: lh();
a {
color: #000;
&:hover {
color: #666;
}
}
li {
background: none;
padding-left: 30px;
div.hitarea {
margin-left: -22px;
background-image: url('/static/images/treeview-default.gif');
&:hover {
opacity: 0.6;
filter: alpha(opacity=60);
}
}
ul {
background: none;
}
}
> li {
border-bottom: 1px solid #d3d3d3;
@include box-shadow(0 1px 0 #eee);
padding: 7px 7px 7px 30px;
}
}
section.book {
......@@ -20,6 +46,10 @@ div.book-wrapper {
@extend .topbar;
@extend .clearfix;
a {
@extend .block-link;
}
ul {
@extend .clearfix;
......
sass/_wiki-create.scss
......@@ -21,7 +21,13 @@ form#wiki_revision {
}
#submit_delete {
@include box-shadow(none);
background: none;
border: none;
color: #999;
float: right;
text-decoration: underline;
font-weight: normal;
}
input[type="submit"] {
......@@ -32,18 +38,25 @@ form#wiki_revision {
#wiki_edit_instructions {
float: left;
width: flex-grid(3, 9);
margin-top: lh();
color: #666;
&:hover {
color: #333;
}
.markdown-example {
background-color: $light-gray;
padding-top: 5px;
padding-right: 2px;
padding-bottom: 5px;
padding-left: 5px;
margin-top: 5px;
margin-bottom: 7px;
margin-left: 5px;
background-color: #e3e3e3;
text-shadow: 0 1px 0 #fff;
padding: {
top: 5px;
right: 2px;
bottom: 5px;
left: 5px;
}
margin: 5px 0 7px;
line-height: 1.0;
}
}
sass/_wiki.scss
......@@ -78,6 +78,10 @@ div.wiki-wrapper {
header {
@extend .topbar;
a {
@extend .block-link;
}
p {
float: left;
padding: 15px;
......
sass/application.scss
......@@ -14,7 +14,7 @@
@import "wiki-basic-html", "wiki-create", "wiki";
@import "activation";
@import "help";
@import "askbot-original", "discussion", "discussion-questions", "discussion-tags" ;
@import "askbot-original", "discussion", "discussion-questions", "discussion-tags", "question-view" ;
// left over
@import "theme";
......
sass/marketing-ie.scss 0 → 100644
body {
margin: 0;
padding: 0;
}
.wrapper, .subpage, section.copyright, section.tos, section.privacy-policy, section.honor-code, header.announcement div, section.index-content, footer {
margin: 0;
overflow: hidden;
}
sass/marketing.scss
@import "bourbon/bourbon";
@import "reset";
@import "font-face";
// pages
@import "index-functions", "index-variables", "index";
@import "index-functions", "index-variables", "index-extends", "index";
@import "leanmodal";
server-down.html 0 → 100644
<%inherit file="main.html" />
<section class="activation">
<h1>Currently the <em>MITx</em> servers are down</h1>
<p>Our staff is currently working to get the site back up as soon as possible. Please email us at <a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a> to report any problems or downtime.</p>
</section>
server-error.html 0 → 100644
<%inherit file="main.html" />
<section class="activation">
<h1>There has been an error on the <em>MITx</em> servers</h1>
<p>Our staff is currently working to get the site back up as soon as possible. Please email us at <a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a> to report any problems or downtime.</p>
</section>
server-overloaded.html 0 → 100644
<%inherit file="main.html" />
<section class="activation">
<h1>Currently the <em>MITx</em> servers are overloaded</h1>
<p>Our staff is currently working to get the site back up as soon as possible. Please email us at <a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a> to report any problems or downtime.</p>
</section>
simplewiki_base.html
......@@ -42,7 +42,7 @@
tex2jax: {inlineMath: [ ['$','$'], ["\\(","\\)"]],
displayMath: [ ['$$','$$'], ["\\[","\\]"]]}
});
</script> <script type="text/javascript" src="/static/lib/mathjax/MathJax.js?config=TeX-AMS_HTML-full"></script>
</script> <script type="text/javascript" src="${ settings.LIB_URL }mathjax/MathJax.js?config=TeX-AMS_HTML-full"></script>
<script>
$(function(){
$.ajaxSetup ({
......@@ -54,7 +54,7 @@
id = $(this).attr("id");
name = id.substring(17);
//alert(name);
$("#"+id).load("/edit_circuit/"+name);
$("#"+id).load("/edit_circuit/"+name, function(){update_schematics();});
f=this;
});
......@@ -65,7 +65,7 @@
$(this).parent().toggleClass("active");
});
update_schematics();});
});
</script>
......
simplewiki_edit.html
......@@ -12,7 +12,7 @@ ${ wiki_article.title }
<input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/>
</div>
${wiki_form}
<input type="submit" id="submit_edit" name="edit" value="Edit article" />
<input type="submit" id="submit_edit" name="edit" value="Save Changes" />
<input type="submit" id="submit_delete" name="delete" value="Delete article" />
</form>
......
simplewiki_error.html
......@@ -74,6 +74,10 @@ ${wiki_error}
<p>
The article you tried to access has been deleted. You may be able to restore it to an earlier version in its <a href="${reverse("wiki_history", args=[wiki_article.get_url(),1])}">history</a>, or <a href="${reverse("wiki_edit", args=[wiki_article.get_url()])}">create a new version</a>.
</p>
%elif wiki_err_norevision is not UNDEFINED:
<p>
This article does not contain revision ${wiki_err_norevision | h}.
</p>
%else:
<p>
An error has occured.
......
simplewiki_history.html
......@@ -70,7 +70,8 @@ ${ wiki_article.title }
</tfoot>
%endif
</table>
<input type="submit" name="change" value="Change revision"
<input type="submit" name="view" value="View revision"/>
<input type="submit" name="change" value="Change to revision"
%if not wiki_write:
disabled="true"
%endif
......
simplewiki_instructions.html
......@@ -5,7 +5,7 @@
<p class="markdown-example">circuit:basic</p>
<p class="markdown-example"><span>$</span>LaTeX Math Expression<span>$</span></p>
To create a new wiki article, create a link to it. Clicking the link gives you the creation page.
<p class="markdown-example">[Article](/wiki/view/Article/Child/)</p>
<p class="markdown-example">[Article](/wiki/view/Article/)</p>
Other useful examples:<br>
<p class="markdown-example">[Link](http://google.com)</p>
<p class="markdown-example">Huge Header
......
simplewiki_view.html
......@@ -8,6 +8,6 @@
<%block name="wiki_body">
<div id="wiki_article">
${ wiki_article.current_revision.contents_parsed| n}
${ wiki_article_revision.contents_parsed| n}
</div>
</%block>
staticbook.html
......@@ -16,7 +16,7 @@ function goto_page(n) {
if(n<10) {
prefix="00";
}
$("#bookpage").attr("src","/static/book/p"+prefix+n+".jpg");
$("#bookpage").attr("src","${ settings.BOOK_URL }p"+prefix+n+".jpg");
};
function prev_page() {
......@@ -56,7 +56,7 @@ function next_page() {
</ul>
</nav>
<img id="bookpage" src="/static/book/p${ "%03i"%(page) }.jpg">
<img id="bookpage" src="${ settings.BOOK_URL }p${ "%03i"%(page) }.jpg">
</section>
</section>
</div>
......
tos.html
......@@ -2,11 +2,290 @@
<section class="tos">
<div>
<h1>MITx Terms of Service</h1>
<p>Welcome to MITx. You must read and agree to these Terms of Service ("TOS") prior to using any portion of this site (&rdquo;Site&ldquo;), including accessing any chat room, mailing list, or other electronic service. These TOS, MITx&rsquo;s Privacy Policy [link] and Honor Code [link] are an agreement between you and the Massachusetts Institute of Technology ("MIT"). By registering for, accessing, browsing, or using any portion of the Site, you acknowledge that you have read, understood and agree to be bound by these TOS, the Privacy Policy and Honor Code. </p>
<p>MITx reserves the right to modify these TOS at any time and will publish notice of any such modifications online on the Site&rsquo;s homepage for a reasonable period of time following such modifications, and by changing the effective date of these TOS. By continuing to access the Site after notice of such modifications has been published, you signify your agreement to be bound by them. </p>
<h2>Description of MITx </h2>
<p>MITx offers online courses, professor-to-student and student-to-student interactivity, individual assessment of a student&rsqyo;s work, and the opportunity for students who demonstrate their mastery of subjects to earn a certificate or credential awarded by MITx. </p>
</div>
<h1>MITx Terms of Service</h1>
<p>Welcome to MITx. You must read and agree to these Terms of Service
(&quot;TOS&quot;), MITx&rsquo;s <a href="/t/privacy.html">Privacy
Policy</a>, and <a href="/t/honor.html">Honor Code</a> prior to
registering for this Site or using any portion of this site
(&ldquo;Site&rdquo;) , including accessing any course materials, chat
room, mailing list, or other electronic service. These TOS, the
Privacy Policy and the Honor Code are agreements (the
&ldquo;Agreements&rdquo;) between you and the Massachusetts Institute
of Technology (&ldquo;MIT&rdquo;). If you do not understand or do not
agree to be bound by the terms of the Agreements, please immediately
exit this site. </p>
<p>MITx reserves the right to modify these TOS at any time and will
publish notice of any such modifications online on the
Site <a href="/t/tos.html">Terms of Service page</a> for a reasonable
period of time following such modifications, and by changing the
effective date of these TOS. By continuing to access the Site
after notice of such modifications has been published, you signify
your agreement to be bound by them. </p>
<h2>Description of MITx </h2>
<p>MITx offers online courses, professor-to-student and
student-to-student interactivity, individual assessment of a
student&rsquo;s work, and the opportunity for students who demonstrate
their mastery of subjects to earn a certificate or credential awarded
by MITx. </p>
<h2>Rules for Online Conduct</h2>
<p>You agree that you are responsible for your own use of the Site and
for your User Postings. &ldquo;User Postings&rdquo; include all
content submitted, posted, published or distributed on the Site by you
or other users of the Site, including but not limited to all forum
posts, notes, questions, and comments. You agree that you will use the
Site in compliance with these TOS and all applicable local, state,
national, and international laws, rules and regulations, including any
laws regarding the transmission of technical data exported from your
country of residence and all United States export control laws.
<p>As a condition of your use of the Services, you will not use the
Site in any manner that could damage, disable, overburden, or impair
any MITx server, or the network(s) connected to any MITx server, or
interfere with any other party&#39;s use and enjoyment of the
Site. You may not attempt to gain unauthorized access to the Site,
other accounts, computer systems or networks connected to any MITx
server through hacking, password mining or any other means. You may
not obtain or attempt to obtain any materials or information through
any means not intentionally made available through the Site. </p>
<h2>The following list of items is strictly prohibited on the Site:</h2>
<ol>
<li>Content that defames or threatens others
<li>Harassing statements or content
<li>Content that discusses illegal activities with the intent to commit them.
<li>Content that infringes another&#39;s intellectual property,
including, but not limited to, copyrights, trademarks, or trade
secrets
<li>Any inappropriate, profane, pornographic, defamatory, obscene,
indecent, or unlawful content
<li>Advertising or any form of commercial solicitation
<li>Political content or content related to partisan political
activities
<li>Viruses, trojan horses, worms, time bombs, corrupted files,
malware, spyware, or any other similar software that may damage the
operation of another&rsquo;s computer or property
<li>Content that contains intentional inaccurate information with the
intent of misleading others.
<li>You, furthermore, agree not to scrape, or otherwise download in
bulk, user-contributed content, a list or directory of users on the
system, or other material including but not limited to on-line
textbooks, User Postings, or user information. You agree not to store
more than 5 pages of the electronic textbook or 5 forum posts in any
permanent medium (hard drive, optical disk, etc., flash drive, etc.).
<lu>You agree to not misrepresent or attempt to misrepresent your
identity while using the Sites (although you are welcome and
encouraged to use an anonymous username in the forums).
</ol>
<h2>User Accounts and Authority</h2>
<p>In order to participate in Site activities, you must provide an
email address (&quot;Email Address&quot;) and a user password
(&quot;User Password&quot;) in order to create a user account
(&ldquo;User Account&rdquo;). You agree that you will never divulge or
share access or access information to your User Account with any third
party for any reason. In setting up your User Account, you may be
prompted or required to enter additional information, including your
name. You understand and agree that all information provided by you is
accurate and current. You agree to maintain and update your
information to keep it accurate and current. </p>
<p>We consider the confidentiality and security of your information to
be of the utmost importance. Please see
our <a href="/t/privacy.html">Privacy Policy</a> for more information
about what information about you MITx collects and how MITx uses that
information.</p>
<h2>Your Right to Use Content on the Site</h2>
<p>Unless indicated as being in the public domain, all content on the
Site is protected by United States copyright. The texts, exams and
other instructional materials provided with the courses offered on
this Site are for your personal use in connection with those courses
only. MIT is planning to make MITx course content and software
infrastructure available under open source licenses that will help
create a vibrant ecosystem of contributors and further MIT&rsquo;s
goal of making education accessible and affordable to the world. </p>
<p>Certain reference documents, digital textbooks, articles and other
information on the Site are used with the permission of third parties
and use of that information is subject to certain rules and
conditions, which will be posted along with the information. By using
this Site you agree to abide by all such terms and conditions. Due to
privacy concerns, student-created content, including all forum posts,
is all Rights Reserved until released under other terms by MITx. </p>
<h2>USER POSTINGS</h2>
<p><strong>User Postings Representations and Warranties.</strong> By
uploading and publishing your User Postings, you affirm, represent,
and warrant that you are the creator and owner of or have the
necessary licenses, rights, consents, and permissions to use and to
authorize MIT and MITx&rsquo;s Users to use and distribute your User
Postings as necessary to exercise the licenses granted by you in these
TOS and in the manner contemplated by MITx. You, and not MITx, are
solely responsible for your User Postings and the consequences of
posting or publishing them.</p>
<p><strong>Limited License Grant to MIT.</strong> By submitting or distributing
User Postings through the Site, you hereby grant to MIT a worldwide,
non-exclusive, transferable, assignable, fully paid-up, royalty-free,
perpetual, irrevocable right and license to host, transfer, display,
perform, reproduce, modify, distribute and re-distribute, relicense,
and otherwise exploit your User Postings, in whole or in part, in any
form, and in any media formats and through any media channels (now
known or hereafter developed).</p>
<p><strong>Limited License Grant to MITx Users.</strong> By submitting
or distributing User Postings through the Site, you hereby grant to
each User of the Site a non-exclusive license to access and use your
User Postings in connection with their use of the Site for their own
personal purposes. </p>
<h2>Use of MITx and MIT Names, Trademarks and Service Marks</h2>
<p>&ldquo;MITx,&rdquo; &quot;MIT&quot;, &quot;Massachusetts Institute
of Technology&quot;, and its logos and seal are trademarks of the
Massachusetts Institute of Technology. You may not use MIT&rsquo;s
names or logos, or any variations thereof, without prior written
consent of MIT. You may not use the MIT name in any of its forms nor
MIT seals or logos for promotional purposes, or in any way that
deliberately or inadvertently claims, suggests, or in MIT&#39;s sole
judgment gives the appearance or impression of a relationship with or
endorsement by MIT.
<p>All Trademarks not owned by MIT that appear on the Site or on or
through the services made available on or through the Site, if any,
are the property of their respective owners. Nothing contained
on the Site should be construed as granting, by implication, estoppel,
or otherwise, any license or right to use any such Trademark displayed
on the Site without the written permission of the third party that may
own the applicable Trademark.
name="id.7dd2c542f51d"></a>
<h2>Digital Millennium Copyright Act</h2>
<p>It is MIT&rsquo;s policy to respond to notices of alleged copyright
infringement that comply with the Digital Millennium Copyright
Act. For more information, please go to MIT&rsquo;s DMCA Notification
Guidelines <a href="http://web.mit.edu/copyright/dmca-notices.html">http://web.mit.edu/copyright/dmca-notices.html</a>,
incorporated herein by reference.</p>
<h2>Disclaimer of Warranty / Indemnification/Limitation of Liabilities</h2>
<p>THE SITE, INCLUDING, WITHOUT LIMITATION, ALL SERVICES, CONTENT,
FUNCTIONS AND MATERIALS PROVIDED ON OR THROUGH THE SITE AND ANY
INFORMATION THEREIN ARE PROVIDED &quot;AS IS&quot; WITHOUT WARRANTY OF
ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION, THE
IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR USE FOR A
PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT AND MIT HEREBY DISCLAIMS
ANY AND ALL SUCH WARRANTIES, EXPRESS OR IMPLIED. MIT does not warrant
the Site will operate in an uninterrupted or error-free manner or that
the Site is free of viruses or other harmful components. Use of
information obtained from or through this Site is at your own
risk. Your access to or download of information, materials, or data
through the Site or any reference sites is at your own discretion and
risk and that you will be solely responsible for any damage to your
property (including your computer system) or loss of data that results
from the download or use of such material or data.</p>
<p><strong>User Postings Disclaimer.</strong> You understand that when
using the Site you will be exposed to User Postings from a variety of
sources, and that MIT is not responsible for the accuracy, usefulness,
reliability, or intellectual property rights of or relating to such
User Postings. You further understand and acknowledge that you may be
exposed to User Postings that are inaccurate, offensive, defamatory,
indecent or objectionable, and you agree to waive, and hereby do
waive, any legal or equitable rights or remedies you have or may have
against MIT with respect thereto. MIT does not endorse any User
Postings or any opinion, recommendation or advice expressed
therein. MITx has no obligation to monitor any User Postings or
any other user communications through the Site. However, MITx reserves
the right to review User Postings and to edit or remove, in whole or
in part, such User Postings in its sole discretion. If notified by a
User or a content owner of a User Posting that allegedly does not
conform to the TOS, MIT may investigate the allegation and determine
in its sole discretion whether to remove the User Posting, which it
reserves the right to do at any time and without notice. </p>
<p><strong>Links to Other Sites.</strong> The Site may include
hyperlinks to sites maintained or controlled by others. MIT is not
responsible for and does not routinely screen, approve, review or
endorse the contents of or use of any of the products or services that
may be offered at these sites. MIT does MIT make any warranty or
representation regarding any linked third party web sites or the
information or materials appearing thereon or any of the products or
services described thereon. Hyperlinks do not imply that MIT is
affiliated or associated with, the linked-third party site. If
you decide to access linked third party web sites, you do so at your
own risk.</p>
<strong>
<p>YOU AGREE THAT MIT WILL NOT BE LIABLE TO YOU FOR ANY LOSS OR
DAMAGES, EITHER ACTUAL OR CONSEQUENTIAL, ARISING OUT OF OR RELATING TO
THESETOS, OR TO YOUR (OR ANY THIRD PARTY&#39;S) USE OR INABILITY TO
USE THE SITE, OR TO YOUR PLACEMENT OF CONTENT ON THE SITE, OR TO YOUR
RELIANCE UPON INFORMATION OBTAINED FROM OR THROUGH THE SITE WHETHER
BASED IN CONTRACT, TORT, STATUTORY OR OTHER LAW, EXCEPT ONLY IN THE
CASE OF DEATH OR PERSONAL INJURY WHERE AND ONLY TO THE EXTENT THAT
APPLICABLE LAW REQUIRES SUCH LIABILITY. </p>
<p>IN PARTICULAR, MIT WILL HAVE NO LIABILTY FOR ANY CONSEQUENTIAL,
INDIRECT, PUNITIVE, SPECIAL, EXEMPLARY OR INCIDENTAL DAMAGES, WHETHER
FORESEEABLE OR UNFORESEEABLE, (INCLUDING, BUT NOT LIMITED TO, CLAIMS
FOR DEFAMATION, ERRORS, LOSS OF DATA, OR INTERRUPTION IN AVAILABILITY
OF DATA).</p>
</strong>
<h2>Indemnification</h2>
<p>You agree to defend, hold harmless and indemnify MIT, and its
subsidiaries, affiliates, officers, agents, and employees from and
against any third-party claims, actions or demands arising out of,
resulting from or in any way related to your use of the Site,
including any liability or expense arising from any and all claims,
losses, damages (actual and consequential), suits, judgments,
litigation costs and attorneys&#39; fees, of every kind and nature. In
such a case, MIT will provide you with written notice of such claim,
suit or action.</p>
<h2>Miscellaneous</h2>
<p><strong>Termination Rights.</strong> You agree that MIT, in its sole
discretion, may terminate your use of the Site or your participation
in it thereof, for any reason or no reason. If you no longer desire to
participate in the Site, you may terminate your participation therein
upon notice to MIT.</p>
<p><strong>Entire Agreement.</strong> This Agreement constitutes the entire agreement
between you and MIT with respect to your use of the Site, superseding
any prior agreements between you and MIT regarding your use of the
Site. </p>
<p><strong>Waiver and Severability of TOS.</strong> The failure of MIT to exercise or
enforce any right or provision of the TOS of Site shall not constitute
a waiver of such right or provision. If any provision of the TOS is
found by a court of competent jurisdiction to be invalid, the parties
nevertheless agree that the court should endeavor to give effect to
the parties&#39; intentions as reflected in the provision, and the
other provisions of the TOS remain in full force and effect.</p>
<p><strong>Choice of Law/Forum Selection.</strong> You agree that any dispute
arising out of or relating to these Terms or any content posted to a
Site will be governed by the laws of the Commonwealth of
Massachusetts, excluding its conflicts of law provisions. You further
consent to the personal jurisdiction of and exclusive venue in the
federal and state courts located in and serving Boston, Massachusetts
as the legal forum for any such dispute.</p>
<p><strong>Effective Date:</strong> January 30, 2012</p><div>
</div>
</section>
video.html
......@@ -8,13 +8,20 @@
</div>
<section class="video-controls">
<ul>
<li><span class="ui-icon ui-icon-play" onclick="play();"></span></li>
<li><span class="ui-icon ui-icon-pause" onclick="pause();"></span></li>
</ul>
<div id="slider"></div>
<div id="vidtime">0:00/0:00</div>
<div id="video_speeds"></div>
<section>
<ul class="vcr">
<li><a class="play" onclick="play();">Play</a></li>
<li><a class="pause" onclick="pause();">Pause</a></li>
</ul>
<div id="vidtime">0:00/0:00</div>
<div class="speeds">
Speed: <div id="video_speeds"></div>
</div>
</section>
</section>
</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