Commit 7adda62f by Ernie Park

fix merge

parents 5eab8ba7 c1543c7f
No preview for this file type
<%inherit file="marketing.html" />
<header class="announcement home">
<header class="announcement">
<div class="anouncement-wrapper">
<nav>
<h1><a href="/t/mitx_global.html">MITx</a></h1>
<a class="modal login" href="#login">Log In</a>
</nav>
......@@ -13,18 +14,38 @@
</div>
</header>
<section class="index-content">
<section class="copyright">
<h1> Licensing Information </h1>
<div>
<h1> Licensing Information </h1>
<table><tr><td> Videos and Ungraded Exercises </td> <td> <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>.</td></tr>
<tr><td>Graded Exercises</td><td>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>.</td></tr>
<tr><td>Textbook</td><td>Textbook is All Rights Reserved Elsevier. We are using it with permission. We apologize for the inclusion of proprietary work. </td></tr>
<tr><td>Student-generated content</td><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></tr>
<tr><td>Source Code</td><td>Source code is All Rights Reserved during the beta offering. We expect to release it under a free and open license shortly thereafter. </td></tr>
</table>
<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>
<p>MIT and MITx are trademarks of the Massachusetts Instititute of
Technology, and may not be used without permission.
<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>
</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>
</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>
</ul>
<p>MIT and MITx are trademarks of the Massachusetts Institute of Technology, and may not be used without permission.</p>
</div>
</section>
......@@ -3,7 +3,7 @@
<h1>Enroll in 6.002 Circuits &amp; Electronics</h1>
<form name="login" method="get">
<% if 'error' in locals(): e = error %>
<fieldset><% if 'error' in locals(): e = error %>
<div id="enroll_error" name="enroll_error"></div>
......@@ -58,11 +58,15 @@
<li class="honor-code">
<label>
<input name="honor_code" id="cb_honor_code" type="checkbox" value="honor_code" required />I agree to: Not engage in any activities that would dishonestly improve my results, or improve or hurt those of others. Never post answers to problems. Maintain only one account.
</label>
<input name="honor_code" id="cb_honor_code" type="checkbox" value="honor_code" required />I agree to the Honor code. </label>
<ul>
<li>Not engage in any activities that would dishonestly improve my results, or improve or hurt those of others.</li>
<li>Never post answers to problems.</li>
<li>Maintain only one account.</li>
</ul>
</li>
</ol>
<input name="create_account_button" id="create_account_button" type="button" value="Create Account">
</form>
</fieldset> </form>
</div>
......@@ -2,7 +2,7 @@
<%include file="navigation.html" />
<section class="main-content">
<section class="help main-content">
<h1>Help</h1>
<p> If you need help, first try <a href="discussion/questions/">asking a question in the forums</a> and in the IRC channel (irc.mitx.org, channel #6002). As the semester starts, we will add a Frequently Asked Questions section.</p>
......
<%inherit file="marketing.html" />
<header class="announcement home">
<header class="announcement">
<div class="anouncement-wrapper">
<nav>
<h1><a href="/t/mitx_global.html">MITx</a></h1>
<a class="modal login" href="#login">Log In</a>
</nav>
......@@ -13,14 +14,14 @@
</div>
</header>
<section class="index-content">
<h1> Honor Code </h1>
<ul>
<li> I agree to not engage in any activities that would dishonestly improve my results, or improve or hurt those of others.
<l1> I agree to never post answers to problems.
<li> I agree to maintain only one account.
</ul>
<section class="honor-code">
<div>
<h1> Honor Code </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>
</div>
</section>
......@@ -34,7 +34,7 @@
</section>
<section class="on-mitx">
<h1>6.002 on MITx</h1> <!-- Link doesn't need to be here, but there should be some way to get back to main MITx site -->
<h1>6.002 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>
......
......@@ -17,6 +17,10 @@
<script type="text/javascript" src="/static/js/schematic.js"></script>
<script type="text/javascript" src="/static/js/cktsim.js"></script>
<!--[if lt IE 9]>
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<!-- Warning: Do not upgrade FancyBox. V2.0 is under a non-free CC license -->
<script type="text/javascript" src="/static/lib/fancybox/jquery.fancybox-1.3.4.js"></script>
<link rel="stylesheet" href="/static/lib/fancybox/jquery.fancybox-1.3.4.css">
......
......@@ -16,7 +16,7 @@
<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="/static/js/schematic.js"></script>
<!-- <script type="text/javascript" src="/static/js/schematic.js"></script> -->
<script type="text/javascript">
$(function(){
......
......@@ -7,7 +7,7 @@
</nav>
<section>
<h1>MITx</h1>
<h1><em>MITx</em></h1>
<h2>An MIT Education Anywhere. For free.</h2>
</section>
</div>
......@@ -15,11 +15,11 @@
<section class="index-content">
<section class="about">
<h1>MITx is MIT&rsquo;s online learning initiative.</h1>
<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 MITx 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>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>
</section>
<section class="features">
......@@ -28,11 +28,11 @@
<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 MITx</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>
</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">MITx FAQ</a></p>
<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>
</section>
</section>
......@@ -47,7 +47,7 @@
<a href="/" 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 MITx.</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>
</section>
<div style="display:none">
......
<div class="header-wrapper">
<header>
<h1>Circuits and Electronics</h1>
<h1><em>MITx</em> Circuits and Electronics</h1>
<nav>
<ul class="coursenav">
<li><a href="/courseware">Courseware</a></li>
<li><a href="/info">Info</a></li>
<li><a href="/book">Textbook</a></li>
<li><a href="/discussion">Discussion</a></li>
<li><a href="/wiki">Wiki</a></li>
<li><a href="/profile">Profile</a></li>
<li><a href="/info">Info</a></li>
</ul>
</nav>
</header>
......
......@@ -3,6 +3,7 @@
<p>Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one.</p>
<form action="/password_reset/" method="post">
<input type='hidden' name='csrfmiddlewaretoken' value='${ csrf }' />
<p><label for="id_email">E-mail address:</label> <input id="id_email" type="text" name="email" maxlength="75" /> <input type="button" id="pwd_reset_button" value="Reset my password" /></p>
<input type='hidden' name='csrfmiddlewaretoken' value='${ csrf }' />
<label for="id_email">E-mail address:</label>
<input id="id_email" type="email" name="email" maxlength="75" /> <input type="button" id="pwd_reset_button" value="Reset my password" />
</form>
<%inherit file="marketing.html" />
<header class="announcement home">
<header class="announcement">
<div class="anouncement-wrapper">
<nav>
<h1><a href="/t/mitx_global.html">MITx</a></h1>
<a class="modal login" href="#login">Log In</a>
</nav>
......@@ -13,9 +14,8 @@
</div>
</header>
<section class="index-content">
<h1> Privacy Policy </h1>
<section class="privacy-policy">
<div>
<h1> Privacy Policy </h1>
</div>
</section>
<%inherit file="main.html" />
<script>
var loc=true; // Activate on clicks? Not if already clicked.
var loc=true; // Activate on clicks? Not if already clicked.
var lang=true;
$(function() {
$("#change_location").click(function() {
log_event("profile", {"type":"location_show", "old":$("#location_sub").text()});
if(loc) {
$("#description").html('<div style="color:#FF0000">'+
"Preferred format is city, state, country (so for us, "+
"&quot;Cambridge, Massachusetts, USA&quot;), but give "+
"as much or as little detail as you want. </div>");
loc=false;
$("#location_sub").html('<input id="id_loc_text" type="text" name="loc_text" />'+
'<input type="button" id="change_loc_button" value="Change" />');
$("#change_loc_button").click(function() {
postJSON('/change_setting', {'location':$("#id_loc_text").attr("value")}, function(json) {
$("#location_sub").text(json.location);
loc=true;
$("#description").html("");
log_event("profile", {"type":"location_change", "new":json.location});
});
});
}
});
$("#change_language").click(function() {
log_event("profile", {"type":"language_show", "old":$("#language_sub").text()});
if(lang) {
lang=false;
$("#language_sub").html('<input id="id_lang_text" type="text" name="lang_text" />'+
'<input type="button" id="change_lang_button" value="Change" />');
$("#change_lang_button").click(function() {
postJSON('/change_setting', {'language':$("#id_lang_text").attr("value")}, function(json) {
$("#language_sub").text(json.language);
lang=true;
$("#description").html("");
log_event("profile", {"type":"language_change", "new":json.language});
});
});
}
});
$('#change_password').click(function(){
$('.modal').trigger('click');
log_event("profile", {"type":"password_show"});
});
$("#change_location").click(function() {
log_event("profile", {"type":"location_show", "old":$("#location_sub").text()});
if(loc) {
$("#description").html('<div>'+
"Preferred format is city, state, country (so for us, "+
"&quot;Cambridge, Massachusetts, USA&quot;), but give "+
"as much or as little detail as you want. </div>");
loc=false;
$("#location_sub").html('<input id="id_loc_text" type="text" name="loc_text" />'+
'<input type="button" id="change_loc_button" value="Change" />');
$("#change_loc_button").click(function() {
postJSON('/change_setting', {'location':$("#id_loc_text").attr("value")}, function(json) {
$("#location_sub").text(json.location);
loc=true;
$("#description").html("");
log_event("profile", {"type":"location_change", "new":json.location});
});
});
}
});
$("#change_language").click(function() {
log_event("profile", {"type":"language_show", "old":$("#language_sub").text()});
if(lang) {
lang=false;
$("#language_sub").html('<input id="id_lang_text" type="text" name="lang_text" />'+
'<input type="button" id="change_lang_button" value="Change" />');
$("#change_lang_button").click(function() {
postJSON('/change_setting', {'language':$("#id_lang_text").attr("value")}, function(json) {
$("#language_sub").text(json.language);
lang=true;
$("#description").html("");
log_event("profile", {"type":"language_change", "new":json.language});
});
});
}
});
$('#change_password').click(function(){
$('.modal').trigger('click');
log_event("profile", {"type":"password_show"});
});
$('#pwd_reset_button').click(function() {
$.post('/password_reset/',{ "csrfmiddlewaretoken" : "${ csrf }",
......@@ -57,7 +58,7 @@ $(function() {
log_event("profile", {"type":"password_send"});
});
});
})
});
</script>
......@@ -72,20 +73,22 @@ $(function() {
<ul>
<li>Forum name: ${username}</li>
<li>E-mail: ${email}</li>
<li>Location: ${location}</li>
<li>Language: ${language}</li>
<li>
Location: <div id="location_sub">${location}</div><div id="description"></div> <a href="#" id="change_location">Change</a>
</li>
<li>
Language: <div id="language_sub">${language}</div> <a href="#" id="change_language">Change</a>
</li>
</ul>
<!-- <div><a class="modal" href="#change_password_pop">Reset password</a></div> -->
<!-- hidden trigger for password -->
<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>
<p>We'll e-mail you a password reset link at ${email}.</p>
<input id="id_email" type="hidden" name="email" maxlength="75" value="${email}" />
<input type="button" id="pwd_reset_button" value="Reset Password" />
<input type="submit" id="pwd_reset_button" value="Reset Password" />
</div>
</section>
......
......@@ -11,14 +11,15 @@ h2 {
text-transform: uppercase;
}
h3 {
}
p {
margin-bottom: $body-line-height;
}
em {
font-style: italic;
font-family: Georgia, serif;
}
#{$all-text-inputs}, textarea {
@include box-shadow(0 -1px 0 #fff);
@include linear-gradient(#eee, #fff);
......
secondaryHeader {
.secondary-nav {
@extend .topbar;
margin: 0;
padding: 15px 0;
nav {
@extend .clearfix;
@extend .wrapper;
@include box-sizing(border-box);
padding: 0 $body-line-height;
div {
float: left;
&.question-filter {
font-size:16px;
margin-top: 4px;
width: grid-width(4);
ul {
@include border-radius(35px);
background: darken(#F6EFD4, 20%);
display: inline;
margin: 0 0 0 10px;
padding: $body-line-height/4 20px;
li {
display: inline-block;
list-style: none;
margin-right: 10px;
&:last-child {
margin-right: 0;
}
a {
text-transform: capitalize;
text-shadow: none;
font-size: 14px;
&.on {
font-weight: bold;
}
}
}
}
}
&.search-box {
margin-left:2%;
text-align:right;
width: grid-width(8);
}
}
}
}
.content-wrapper {
@extend .clearfix;
@extend .wrapper;
@include box-shadow(0 1px 0 #fff);
@include box-sizing(border-box);
background: #fff;
border: 1px solid #ccc;
border-top: 0;
.discussion-content {
/*@extend .content;*/
@include box-sizing(border-box);
display: table-cell;
padding: $gw-gutter;
vertical-align: top;
width: grid-width(9);
}
aside {
@extend .sidebar;
width: grid-width(2.5);
padding: $gw-gutter;
h2 {
font-size: 16px;
}
h3 {
border-bottom: 0;
box-shadow: none;
}
input[type="text"] {
width: 68%;
}
#displayTagFilterControl {
margin-top: 10px;
}
}
}
.footer-wrapper {
@extend .clearfix;
@extend .wrapper;
@include box-shadow(0 1px 0 #fff);
@include box-sizing(border-box);
border-top: 0;
padding: 0 $gw-gutter/2;
}
......@@ -4,6 +4,7 @@ div#fancybox-overlay {
div#fancybox-wrap {
width: auto !important;
div#fancybox-outer {
background: none;
max-width: 600px;
......@@ -26,7 +27,6 @@ div#fancybox-wrap {
h1 {
font-size: 24px;
margin-top: 0;
font-family: "Oswald";
padding-bottom: lh();
border-bottom: 1px solid #eee;
margin-bottom: lh();
......@@ -35,28 +35,40 @@ div#fancybox-wrap {
form {
text-align: left;
div#enroll_error {
padding-bottom: lh();
color: #DF8B2C;
div#enroll_error, div#login_error {
margin-bottom: lh();
background-color: #F50200;
color: #fff;
text-transform: uppercase;
letter-spacing: 1px;
font-weight: bold;
-webkit-font-smoothing: antialiased;
padding: lh(.2);
&:empty {
padding: 0;
}
}
label {
display: block;
font-weight: bold;
}
#{$all-text-inputs} {
width: 100%;
@include box-sizing(border-box);
}
input[type="checkbox"] {
margin-right: 10px;
}
ol {
li {
margin-bottom: lh();
width: grid-width(6);
float: left;
&:nth-child(odd) {
margin-right: $gw-gutter;
}
&.terms, &.remember {
float: none;
width: auto;
clear: both;
padding-top: lh();
border-top: 1px solid #eee;
}
......@@ -66,18 +78,18 @@ div#fancybox-wrap {
float: none;
}
label {
display: block;
font-weight: bold;
}
#{$all-text-inputs} {
width: 100%;
@include box-sizing(border-box);
}
ul {
list-style: disc outside none;
margin: lh(.5) 0 lh() lh();
input[type="checkbox"] {
margin-right: 10px;
li {
list-style: disc outside none;
margin-bottom: lh(.5);
color: #666;
font-size: 14px;
float: none;
}
}
}
}
......@@ -89,6 +101,7 @@ div#fancybox-wrap {
}
}
div#login {
min-width: 300px;
......@@ -106,11 +119,22 @@ div#fancybox-wrap {
a {
color: #999;
&:hover {
color: #444;
}
}
}
div#pwd_reset {
p {
margin-bottom: lh();
}
input[type="email"] {
margin-bottom: lh();
}
}
}
}
}
section.help.main-content {
padding: lh();
p {
max-width: 700px;
}
dl {
margin-bottom: lh();
dd, dt {
margin-bottom: lh(.5);
}
dt {
font-weight: bold;
}
}
}
......@@ -24,4 +24,6 @@ $header-font-family: "Open Sans", Helvetica, Arial, sans-serif;
$lh: golden-ratio($body-font-size, 1);
// Colors
$mit-red: #990000;
$cream: #F6EFD4;
......@@ -7,13 +7,24 @@
@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 {
......@@ -25,6 +36,37 @@
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;
......@@ -43,6 +85,8 @@
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%);
......@@ -54,40 +98,63 @@
}
}
body {
background-color: #fff;
color: #444;
font: $body-font-size $body-font-family;
#{$all-text-inputs}, textarea {
@include box-shadow(0 -1px 0 #fff);
@include linear-gradient(#eee, #fff);
border: 1px solid #999;
font: $body-font-size $body-font-family;
padding: 4px;
width: 100%;
h1 {
font: 800 24px $header-font-family;
}
&:focus {
border-color: $mit-red;
li {
margin-bottom: lh();
}
em {
font-style: italic;
}
a {
color: $mit-red;
font-style: italic;
text-decoration: none;
&:hover, &:focus {
color: darken($mit-red, 10%);
}
}
#{$all-text-inputs}, textarea {
@include box-shadow(0 -1px 0 #fff);
@include linear-gradient(#eee, #fff);
border: 1px solid #999;
font: $body-font-size $body-font-family;
padding: 4px;
width: 100%;
&:focus {
border-color: $mit-red;
}
}
}
}
header.announcement {
color: #fff;
// @include background-size(cover);
background: #333;
border-bottom: 1px solid #000;
background: #e3e3e3;
@include background-size(cover);
color: #fff;
-webkit-font-smoothing: antialiased;
&.home {
background: #e3e3e3 url("/static/images/marketing/shot-1-medium.jpg");
@media screen and (min-width: 1200px) {
background: #e3e3e3 url("/static/images/marketing/shot-1-large.jpg");
}
@media screen and (max-width: 1199px) {
background: #e3e3e3 url("/static/images/marketing/shot-1-medium.jpg");
}
// @media screen and (max-width: 1199px) {
// }
div {
padding: lh(10) lh() lh(3);
......@@ -95,6 +162,7 @@ header.announcement {
}
&.course {
background: #e3e3e3 url("/static/images/marketing/course-bg-small.jpg");
@media screen and (min-width: 1200px) {
background: #e3e3e3 url("/static/images/marketing/course-bg-large.jpg");
......@@ -102,12 +170,6 @@ header.announcement {
@media screen and (max-width: 1199px) and (min-width: 700px) {
background: #e3e3e3 url("/static/images/marketing/course-bg-medium.jpg");
@include background-size(cover);
}
@media screen and (max-width: 699px) {
background: #e3e3e3 url("/static/images/marketing/course-bg-small.jpg");
@include background-size(cover);
}
div {
......@@ -124,6 +186,7 @@ header.announcement {
top: 0;
right: lh();
@include border-radius(0 0 3px 3px);
background: #333;
background: rgba(#000, .7);
padding: lh(.5);
......@@ -132,7 +195,7 @@ header.announcement {
margin-right: lh();
a {
font: 800 18px $header-font-family;
font: italic 800 18px $header-font-family;
color: #fff;
text-decoration: none;
}
......@@ -142,6 +205,7 @@ header.announcement {
text-decoration: none;
color: #fff;
font-size: 12px;
font-style: normal;
&:hover {
color: rgba(#fff, .6);
......@@ -267,6 +331,7 @@ section.index-content {
p {
width: auto;
clear: both;
strong {
font-family: "Open sans";
......@@ -326,6 +391,8 @@ section.index-content {
}
ul {
list-style: none;
li {
img {
float: left;
......@@ -399,6 +466,10 @@ section.index-content {
}
}
section.copyright, section.tos, section.privacy-policy, section.honor-code {
@extend .subpage;
}
footer {
@extend .wrapper;
@extend .clearfix;
......
......@@ -29,6 +29,11 @@ html {
float: left;
color: #000;
text-shadow: 0 1px 0 lighten($mit-red, 10%);
em {
@include inline-block();
padding-right: lh();
}
}
nav {
......@@ -44,7 +49,7 @@ html {
margin: 0;
li {
margin-right: $body-line-height;
margin-right: lh();
display: inline-block;
margin-bottom: 0;
......
html, body, div, span, applet, object, iframe,
/*
html5doctor.com Reset Stylesheet
v1.6.1
Last Updated: 2010-09-17
Author: Richard Clark - http://richclarkdesign.com
Twitter: @rich_clark
*/
html, body, div, span, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
del, dfn, em, font, img, ins, kbd, q, s, samp,
small, strike, strong, sub, sup, tt, var,
abbr, address, cite, code,
del, dfn, em, img, ins, kbd, q, samp,
small, strong, sub, sup, var,
b, i,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td {
margin: 0;
padding: 0;
border: 0;
outline: 0;
font-weight: inherit;
font-style: inherit;
font-size: 100%;
font-family: inherit;
vertical-align: baseline;
}
/* remember to define focus styles! */
:focus {
outline: 0;
table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, figcaption, figure,
footer, header, hgroup, menu, nav, section, summary,
time, mark, audio, video {
margin:0;
padding:0;
border:0;
outline:0;
font-size:100%;
vertical-align:baseline;
background:transparent;
}
body {
line-height: 1;
color: black;
background: white;
line-height:1;
}
ol, ul {
list-style: none;
article,aside,details,figcaption,figure,
footer,header,hgroup,menu,nav,section {
display:block;
}
/* tables still need 'cellspacing="0"' in the markup */
table {
border-collapse: separate;
border-spacing: 0;
nav ul {
list-style:none;
}
caption, th, td {
text-align: left;
font-weight: normal;
blockquote, q {
quotes:none;
}
blockquote:before, blockquote:after,
q:before, q:after {
content: "";
content:'';
content:none;
}
blockquote, q {
quotes: "" "";
a {
margin:0;
padding:0;
font-size:100%;
vertical-align:baseline;
background:transparent;
}
/* change colours to suit your needs */
ins {
background-color:#ff9;
color:#000;
text-decoration:none;
}
/* change colours to suit your needs */
mark {
background-color:#ff9;
color:#000;
font-style:italic;
font-weight:bold;
}
del {
text-decoration: line-through;
}
abbr[title], dfn[title] {
border-bottom:1px dotted;
cursor:help;
}
table {
border-collapse:collapse;
border-spacing:0;
}
/* change border colour to suit your needs */
hr {
display:block;
height:1px;
border:0;
border-top:1px solid #cccccc;
margin:1em 0;
padding:0;
}
input, select {
vertical-align:middle;
}
......@@ -129,6 +129,5 @@ div.wiki-wrapper {
p {
line-height: 1.6em;
}
}
}
......@@ -13,7 +13,8 @@
@import "profile";
@import "wiki-create", "wiki";
@import "activation";
@import "discussion";
@import "help";
@import "discussion", "askbot-original";
// left over
@import "theme";
......
......@@ -84,7 +84,7 @@
if (wiki_article is not UNDEFINED):
baseURL = reverse("wiki_view", args=[wiki_article.get_url()])
else:
baseURL = reverse("wiki_view", args=[""])
baseURL = reverse("wiki_view", args=["/"])
%>
<ul class="action">
......@@ -113,14 +113,14 @@
<div id="wiki_create_form">
<%
theaction = "this.wiki_article_name.value.replace(/([^a-zA-Z0-9\-])/g, '')+'/_create/'"
theaction = "this.wiki_article_name.value.replace(/([^a-zA-Z0-9\-])/g, '')"
if (wiki_article is not UNDEFINED):
baseURL = reverse("wiki_view", args=[wiki_article.get_url()])
baseURL = reverse("wiki_create", args=[wiki_article.get_url()])
else:
baseURL = reverse("wiki_view", args=[""])
baseURL = reverse("wiki_create", args=["/"])
%>
<form method="GET" onsubmit="this.action='${baseURL + "/' + " + theaction};">
<form method="GET" onsubmit="this.action='${baseURL + "' + " + theaction};">
<div>
<label for="id_wiki_article_name">Title of article</label>
......
......@@ -14,6 +14,7 @@ ${ wiki_article.title }
${wiki_form}
<input type="submit" value="Edit article" /></td>
<input type="submit" name="edit" value="Edit article" />
<input type="submit" name="delete" value="Delete article" />
</form>
</%block>
......@@ -18,85 +18,66 @@ ${wiki_error}
%endif
%if wiki_err_notfound is not UNDEFINED:
%if wiki_url is not UNDEFINED:
<p>
The page you requested could not be found.
Click <a href="${reverse("wiki_create", args=[wiki_url])}">here</a> to create it.
</p>
%else:
<p>
Or maybe rather: Congratulations! It seems that there's no root
article, which is probably because you just installed simple-wiki
and your installation is working. Now you can create the root article.
Click <a href="{% url wiki_create "" %}">here</a> to create it.
</p>
%endif
%if wiki_url is not UNDEFINED:
<p>
The page you requested could not be found.
Click <a href="${reverse("wiki_create", args=[wiki_url])}">here</a> to create it.
</p>
%else:
<p>
Or maybe rather: Congratulations! It seems that there's no root
article, which is probably because you just installed simple-wiki
and your installation is working. Now you can create the root article.
Click <a href="{% url wiki_create "" %}">here</a> to create it.
</p>
%endif
%else:
%if wiki_err_noparent is not UNDEFINED:
<p>
You cannot create this page, because its parent
does not exist. Click <a href="${reverse("wiki_create", args=[wiki_url_parent])}">here</a>
to create it.
</p>
%else:
%if wiki_err_keyword is not UNDEFINED:
<p>
The page you're trying to create <b>${wiki_url}</b> starts with <b>_</b>, which is reserved for internal use.
</p>
<p>
You cannot create this page, because its parent
does not exist. Click <a href="${reverse("wiki_create", args=[wiki_url_parent])}">here</a>
to create it.
</p>
%else:
%if wiki_err_locked is not UNDEFINED:
<p>
The article you are trying to modify is locked.
</p>
%else:
%if wiki_err_noread is not UNDEFINED:
<p>
You do not have access to read this article.
</p>
%else:
%if wiki_err_nowrite is not UNDEFINED:
<p>
You do not have access to edit this article.
</p>
%else:
%if wiki_err_noanon is not UNDEFINED:
<p>
Anonymous attachments are not allowed. Try logging in.
</p>
%else:
%if wiki_err_create is not UNDEFINED:
<p>
You do not have access to create this article.
</p>
%if wiki_err_keyword is not UNDEFINED and wiki_err_keyword:
<p>
The page you're trying to create <b>${wiki_url}</b> starts with <b>_</b>, which is reserved for internal use.
</p>
%elif wiki_err_locked is not UNDEFINED and wiki_err_locked:
<p>
The article you are trying to modify is locked.
</p>
%elif wiki_err_noread is not UNDEFINED and wiki_err_noread:
<p>
You do not have access to read this article.
</p>
%elif wiki_err_nowrite is not UNDEFINED and wiki_err_nowrite:
<p>
You do not have access to edit this article.
</p>
%elif wiki_err_noanon is not UNDEFINED and wiki_err_noanon:
<p>
Anonymous attachments are not allowed. Try logging in.
</p>
%elif wiki_err_create is not UNDEFINED and wiki_err_create:
<p>
You do not have access to create this article.
</p>
%elif wiki_err_encode is not UNDEFINED and wiki_err_encode:
<p>
The url you requested could not be handled by the wiki.
Probably you used a bad character in the URL.
Only use digits, English letters, underscore and dash. For instance
/wiki/An_Article-1
</p>
%elif wiki_err_deleted is not UNDEFINED and wiki_err_deleted:
<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>
%else:
%if wiki_err_encode is not UNDEFINED:
<p>
The url you requested could not be handled by the wiki.
Probably you used a bad character in the URL.
Only use digits, English letters, underscore and dash. For instance
/wiki/An_Article-1
</p>
%else:
<p>
An error has occured.
</p>
%endif
%endif
%endif
%endif
%endif
%endif
<p>
An error has occured.
</p>
%endif
%endif
%endif
......
......@@ -27,30 +27,32 @@ ${ wiki_article.title }
<tbody>
<% loopCount = 0 %>
%for revision in wiki_history:
<% loopCount += 1 %>
<tr style="border-top: 1px" ${'class="dark"' if (loopCount % 2) == 0 else ''}>
<td width="15px">
<input type="radio" name="revision" id="${revision.id}" value="${revision.id}"${"checked" if wiki_article.current_revision.id == revision.id else ""}/>
<label for="${revision.id}">
${ revision }
%if revision.previous_revision:
%if not revision.counter == revision.previous_revision.counter + 1:
<br/>(based on ${revision.previous_revision})
%endif
%endif
</label>
</td>
<td>
${ revision.revision_text if revision.revision_text else "<i>None</i>" }</td>
<td class="diff">
%for x in revision.get_diff():
${x|h}<br/>
%endfor </td>
<td>${revision.get_user}
<br/>
${revision.revision_date.strftime("%b %d, %Y, %I:%M %p")}
</td>
</tr>
%if revision.deleted < 2 or show_delete_revision:
<% loopCount += 1 %>
<tr style="border-top: 1px" class="${'dark ' if (loopCount % 2) == 0 else ''}${'deleted ' if (revision.deleted==2) else ''}" >
<td width="15px">
<input type="radio" name="revision" id="${revision.id}" value="${revision.id}"${"checked" if wiki_article.current_revision.id == revision.id else ""}/>
<label for="${revision.id}">
${ revision }
%if revision.previous_revision:
%if not revision.counter == revision.previous_revision.counter + 1:
<br/>(based on ${revision.previous_revision})
%endif
%endif
</label>
</td>
<td>
${ revision.revision_text if revision.revision_text else "<i>None</i>" }</td>
<td class="diff">
%for x in revision.get_diff():
${x|h}<br/>
%endfor </td>
<td>${revision.get_user()}
<br/>
${revision.revision_date.strftime("%b %d, %Y, %I:%M %p")}
</td>
</tr>
%endif
%endfor
</tbody>
%if wiki_prev_page or wiki_next_page:
......@@ -68,10 +70,16 @@ ${ wiki_article.title }
</tfoot>
%endif
</table>
<input type="submit" value="Change revision"
<input type="submit" name="change" value="Change revision"
%if not wiki_write:
disabled="true"
%endif
/>
%if show_delete_revision:
<input type="submit" name="delete" value="Admin Delete revision"/>
<input type="submit" name="restore" value="Admin Restore revision"/>
<input type="submit" name="delete_all" value="Admin Delete all revisions">
<input type="submit" name="lock_article" value="${'Lock Article' if not wiki_article.locked else 'Unlock Article'}">
%endif
</form>
</%block>
......@@ -16,11 +16,8 @@
<%block name="wiki_body">
%for article in wiki_search_results:
%if article is not UNDEFINED:
<a href="${reverse("wiki_view", args=[article.get_url()])}">${article.get_url()}</a><br/>
%else:
<a href="${reverse("wiki_view", args=[''])}">/</a><br/>
%endif
<% article_deleted = not article.current_revision.deleted == 0 %>
<a href="${reverse("wiki_view", args=[article.get_url()])}">${article.get_url()} ${'(Deleted)' if article_deleted else ''}</a><br/>
%endfor
%if not wiki_search_results:
......
......@@ -3,7 +3,7 @@
<%inherit file="simplewiki_base.html"/>
<%block name="wiki_page_title">
${ wiki_article.title }
${ wiki_article.title } ${'<span style="color: red;">- Deleted Revision!</span>' if wiki_current_revision_deleted else ''}
</%block>
<%block name="wiki_body">
......
<%inherit file="marketing.html" />
<header class="announcement home">
<header class="announcement">
<div class="anouncement-wrapper">
<nav>
<h1><a href="/t/mitx_global.html">MITx</a></h1>
<a class="modal login" href="#login">Log In</a>
</nav>
......@@ -13,18 +14,13 @@
</div>
</header>
<section class="index-content">
<h1> Terms of Service </h1>
<table><tr><td> Videos and Ungraded Exercises </td> <td> <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>.</td></tr>
<tr><td>Graded Exercises</td><td>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>.</td></tr>
<tr><td>Textbook</td><td>Textbook is All Rights Reserved Elsevier. We are using it with permission. We apologize for the inclusion of proprietary work. </td></tr>
<tr><td>Student-generated content</td><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></tr>
<tr><td>Source Code</td><td>Source code is All Rights Reserved during the beta offering. We expect to release it under a free and open license shortly thereafter. </td></tr>
</table>
<p>MIT and MITx are trademarks of the Massachusetts Instititute of
Technology, and may not be used without permission.
<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>
</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