Skip to content

E
edx-platform
Commit 12c1c8be by Kyle Fiedler
Options

Merged with default 

--HG--
branch : templates-ky-new-nav
parents 44a5c695 d0cd1f5e
Showing with 433 additions and 257 deletions
6002x-faq.html
......@@ -18,6 +18,64 @@ This set of questions and answers accompanies MIT’s February 13,
6.002x: Circuits and Electronics.
</p>
<h2> I tried to register for the course, but it says the username
is already taken.</h2>
<p> The system only allows each username to be used once. Probably,
someone else already signed up with that username. Try a different,
more unique username. For example, try adding a random number to the
end.</p>
<h2> I am interested in a different subject. What other courses do
you offer? </h2>
<p> 6.002x is the pilot course for MITx. While we plan to offer a
range of courses in the future, at present, 6.002x is the only course
available.</p>
<h2>How will I know that the course has started?</h2>
<p> The course will start on March 5. Check the website
mitx.mit.edu as the date approaches. A login button will appear on
the course website 6.002x.mitx.mit.edu on or slightly before March 5
so you can login, begin to get familiar with the site and start the
course.</p>
<h2> Why is there no log-in button?</h2>
<p> You will not be able to log into the course until either the
starting date, or shortly before.</p>
<h2> Does the class have a schedule?</h2>
<p> The lectures are on-line videos, and may be watched at your own
pace and schedule. The course will have fixed deadlines for homework
assignments and exams. </p>
<h2> I just enrolled for the course. I have not received any form
of acknowledgement that I have enrolled.</h2>
<p> You should receive a single activation e-mail. If you did not,
check your spam folder, or try to register again with your correct
e-mail address and a new username (most errors are from typos in
e-mail addresses).</p>
<h2> How do I drop the course?</h2>
<p> You do not have to do anything. You can simply stop working on the
course at any time you choose to do so.</p>
<h2>What happens if I drop the course?</h2>
<p> For the prototype course, learners achieving grades of "A," "B,"
or "C" will receive an electronic Certificate of completion with the
learner's name and grade on it. If you receive a grade below a "C" or
do not complete the course, you will not receive a Certificate and no
grade record attaching your name to your participation in the class
will be disclosed outside of MITx. You can also choose to opt for a
no record at any time. However, the posts you make while enrolled in
the class will remain visible. </p>
<h2>
What is <i>MITx</i>?</h2>
......
activation_email.txt
......@@ -6,4 +6,5 @@ into your web browser's address bar:
http://${ site }/activate/${ key }
If you didn't request this, you don't need to do anything; you won't
receive any more email from us.
receive any more email from us. Please do not reply to this e-mail; if
you require assistance, check the help section of the MITx web site.
mitx_help.html
......@@ -5,7 +5,10 @@
<section class="help-email">
<h2>Help &amp; Feedback</h2>
<p> If run into problems signing up for the web site which you
cannot resolve on your own, you can reach us at:</p>
cannot resolve on your own, please check
the <a href="http://mitx.mit.edu/6002x-faq.html">Frequently
Asked Questions</a>. If you find a bug or other issues, you can
reach us at:</p>
<dl>
<dt>System-related questions</dt>
<dd><a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a></dd>
......
profile.html
......@@ -91,49 +91,45 @@ $(function() {
<div id="grade-detail-graph" style="width:650px;height:200px;"></div>
<ol>
<%
lastChapter = None
%>
% for hw in homeworks:
<ol class="chapters">
%for chapter in chapters:
%if not chapter['chapter'] == "hidden":
<li>
%if hw['chapter'] != lastChapter:
<h2><a href="${reverse('courseware_chapter', args=format_url_params([hw['course'], hw['chapter']])) }">
${ hw['chapter'] }</a></h2>
<% lastChapter = hw['chapter'] %>
%else:
<h2>-</h2>
%endif
<h2><a href="${reverse('courseware_chapter', args=format_url_params([chapter['course'], chapter['chapter']])) }">
${ chapter['chapter'] }</a></h2>
<div class="scores">
<h3><a href="${reverse('courseware_section', args=format_url_params([hw['course'], hw['chapter'], hw['section']])) }">
<ol class="sections">
%for section in chapter['sections']:
<li>
<%
earned = hw['section_total'][0]
total = hw['section_total'][1]
earned = section['section_total'][0]
total = section['section_total'][1]
percentageString = "{0:.0%}".format( float(earned)/total) if earned > 0 else ""
%>
${ hw['section'] }</a> ${"({0}/{1}) {2}".format( earned, total, percentageString )}</h3>
${hw['subtitle']}
% if 'due' in hw and hw['due']!="":
due ${hw['due']}
% endif
<ul>
%if len(hw['scores']) > 0:
%if hw['graded']:
Problem Scores:
%else:
Practice Scores:
%endif
% for score in hw['scores']:
<li>${ score[0] }/${ score[1] }</li>
% endfor
<h3><a href="${reverse('courseware_section', args=format_url_params([chapter['course'], chapter['chapter'], section['section']])) }">
${ section['section'] }</a> ${"({0}/{1}) {2}".format( earned, total, percentageString )}</h3>
${section['subtitle']}
%if 'due' in section and section['due']!="":
due ${section['due']}
%endif
</ul>
</div>
</li>
% endfor
%if len(section['scores']) > 0:
<ol class="scores">
${ "Problem Scores: " if section['graded'] else "Practice Scores: "}
%for score in section['scores']:
<li class="score">${ score[0] }/${ score[1] }</li>
%endfor
</ol>
%endif
</li> <!--End section-->
%endfor
</ol> <!--End sections-->
</li> <!--End chapter-->
%endif
%endfor
</ol> <!--End chapters-->
</section>
<section class="user-info">
......
sass/_profile.scss
......@@ -57,31 +57,50 @@ div.profile-wrapper {
@extend .top-header;
}
ol {
> ol {
list-style: none;
border-top: 1px solid #e3e3e3;
margin-top: lh();
> li {
border-bottom: 1px solid #e3e3e3;
padding: lh() 0;
width: 100%;
display: table;
@extend .clearfix;
h2 {
float: left;
display: table-cell;
padding: 0;
margin: 0;
width: flex-grid(2, 9);
margin-right: flex-gutter(9);
padding-right: flex-gutter(9);
border-right: 1px dotted #ccc;
@include box-sizing(border-box);
}
div.scores {
float: left;
ol.sections {
padding-left: flex-gutter(9);
display: table-cell;
list-style: none;
width: flex-grid(7, 9);
> li {
padding:0 0 lh() 0;
&:first-child {
padding-top: 0;
}
&:last-child {
border-bottom: 0;
}
h3 {
color: #666;
}
ul {
ol {
list-style: none;
li {
......@@ -92,6 +111,7 @@ div.profile-wrapper {
}
}
}
}
}
}
sass/base/_extends.scss
......@@ -36,6 +36,8 @@ h1.top-header {
font: bold $body-font-size $body-font-family;
cursor: pointer;
-webkit-font-smoothing: antialiased;
text-shadow: none;
text-decoration: none;
&:hover, &:focus {
@include box-shadow(inset 0 1px 0 lighten(#888, 20%), 0 0 3px #ccc);
......@@ -107,6 +109,10 @@ h1.top-header {
}
}
}
a.button {
text-decoration: none;
}
}
.topbar {
......
sass/courseware/_sidebar.scss
section.course-index {
@extend .sidebar;
position: relative;
@extend .tran;
div#open_close_accordion {
@include box-shadow(0 1px 0 #eee);
border-bottom: 1px solid #d3d3d3;
padding: 0 lh();
position: relative;
h2 {
padding-right: 20px;
......@@ -18,7 +18,7 @@ section.course-index {
height: 16px;
position: absolute;
padding: 8px;
top: 12px;
top: -12px;
right: -1px;
border: 1px solid #D3D3D3;
background: #eee url('/static/images/slide-left-icon.png') center center no-repeat;
......
sass/discussion/_askbot-original.scss
......@@ -396,27 +396,27 @@ body.anon #searchBar {
text-align: right;
margin: 0; } }
h2 {
padding-left: 0;
/*background: #eceeeb;*/
height: 30px;
line-height: 30px;
/*text-align: right;*/
/*font-size: 18px !important;*/
font-weight: normal;
color: #656565;
/*padding-right: 10px;*/
/*margin-bottom: 10px;*/
/*font-family: 'Yanone Kaffeesatz',sans-serif;*/
// padding-left: 0;
// /*background: #eceeeb;*/
// height: 30px;
// line-height: 30px;
// /*text-align: right;*/
// /*font-size: 18px !important;*/
// // font-weight: normal;
// // color: #656565;
// /*padding-right: 10px;*/
// /*margin-bottom: 10px;*/
// /*font-family: 'Yanone Kaffeesatz',sans-serif;*/
}
h3 {
/*color: #4a757f;*/
/*font-size: 18px;*/
text-align: left;
font-weight: normal;
/*font-family: 'Yanone Kaffeesatz',sans-serif;*/
padding-left: 0px; }
.contributorback {
background: #eceeeb url(../images/contributorsback.png) no-repeat center left; }
// h3 {
// /*color: #4a757f;*/
// /*font-size: 18px;*/
// text-align: left;
// font-weight: normal;
// /*font-family: 'Yanone Kaffeesatz',sans-serif;*/
// padding-left: 0px; }
// .contributorback {
// background: #eceeeb url(../images/contributorsback.png) no-repeat center left; }
// label {
// color: #707070;
// font-size: 15px;
......@@ -428,23 +428,23 @@ body.anon #searchBar {
// margin-right: 18px; }
// #displayTagFilterControl label {
// width: 160px; }
ul {
margin-left: 22px; }
li {
list-style-type: disc;
font-size: 13px;
line-height: 20px;
margin-bottom: 10px;
color: #707070; }
ul.tags {
list-style: none;
margin: 0;
padding: 0;
line-height: 170%;
display: block; }
#displayTagFilterControl p label {
color: #707070;
font-size: 15px; }
// ul {
// margin-left: 22px; }
// li {
// list-style-type: disc;
// font-size: 13px;
// line-height: 20px;
// margin-bottom: 10px;
// color: #707070; }
// ul.tags {
// list-style: none;
// margin: 0;
// padding: 0;
// line-height: 170%;
// display: block; }
// #displayTagFilterControl p label {
// color: #707070;
// font-size: 15px; }
/*.inputs {
#interestingTagInput, #ignoredTagInput {
width: 153px;
......@@ -474,47 +474,47 @@ body.anon #searchBar {
box-shadow: 1px 1px 2px #808080; }
#interestingTagAdd:hover, #ignoredTagAdd:hover {
background: url(../images/small-button-blue.png) repeat-x bottom; } }*/
img.gravatar {
margin: 1px; }
a {
&.followed, &.follow {
background: url(../images/medium-button.png) top repeat-x;
height: 34px;
line-height: 34px;
text-align: center;
border: 0;
font-family: 'Yanone Kaffeesatz',sans-serif;
color: #4a757f;
font-weight: normal;
font-size: 21px;
margin-top: 3px;
display: block;
width: 120px;
text-decoration: none;
border-radius: 4px;
-ms-border-radius: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
-khtml-border-radius: 4px;
-webkit-box-shadow: 1px 1px 2px #636363;
-moz-box-shadow: 1px 1px 2px #636363;
box-shadow: 1px 1px 2px #636363;
margin: 0 auto;
padding: 0; }
&.followed:hover, &.follow:hover {
text-decoration: none;
background: url(../images/medium-button.png) bottom repeat-x;
text-shadow: 0px 1px 0px #c6d9dd;
-moz-text-shadow: 0px 1px 0px #c6d9dd;
-webkit-text-shadow: 0px 1px 0px #c6d9dd; }
&.followed {
div.unfollow {
display: none; }
&:hover div {
display: none;
&.unfollow {
display: inline;
color: #a05736; } } } }
// img.gravatar {
// margin: 1px; }
// a {
// &.followed, &.follow {
// background: url(../images/medium-button.png) top repeat-x;
// height: 34px;
// line-height: 34px;
// text-align: center;
// border: 0;
// font-family: 'Yanone Kaffeesatz',sans-serif;
// color: #4a757f;
// font-weight: normal;
// font-size: 21px;
// margin-top: 3px;
// display: block;
// width: 120px;
// text-decoration: none;
// border-radius: 4px;
// -ms-border-radius: 4px;
// -moz-border-radius: 4px;
// -webkit-border-radius: 4px;
// -khtml-border-radius: 4px;
// -webkit-box-shadow: 1px 1px 2px #636363;
// -moz-box-shadow: 1px 1px 2px #636363;
// box-shadow: 1px 1px 2px #636363;
// margin: 0 auto;
// padding: 0; }
// &.followed:hover, &.follow:hover {
// text-decoration: none;
// background: url(../images/medium-button.png) bottom repeat-x;
// text-shadow: 0px 1px 0px #c6d9dd;
// -moz-text-shadow: 0px 1px 0px #c6d9dd;
// -webkit-text-shadow: 0px 1px 0px #c6d9dd; }
// &.followed {
// div.unfollow {
// display: none; }
// &:hover div {
// display: none;
// &.unfollow {
// display: inline;
// color: #a05736; } } } }
.favorite-number {
padding: 5px 0 0 5px;
font-size: 100%;
......@@ -839,35 +839,35 @@ body.anon #searchBar {
.paginator-container-left {
padding: 5px 0 10px 0; } }
.tag-size-1 {
font-size: 12px; }
// .tag-size-1 {
// font-size: 12px; }
.tag-size-2 {
font-size: 13px; }
// .tag-size-2 {
// font-size: 13px; }
.tag-size-3 {
font-size: 14px; }
// .tag-size-3 {
// font-size: 14px; }
.tag-size-4 {
font-size: 15px; }
// .tag-size-4 {
// font-size: 15px; }
.tag-size-5 {
font-size: 16px; }
// .tag-size-5 {
// font-size: 16px; }
.tag-size-6 {
font-size: 17px; }
// .tag-size-6 {
// font-size: 17px; }
.tag-size-7 {
font-size: 18px; }
// .tag-size-7 {
// font-size: 18px; }
.tag-size-8 {
font-size: 19px; }
// .tag-size-8 {
// font-size: 19px; }
.tag-size-9 {
font-size: 20px; }
// .tag-size-9 {
// font-size: 20px; }
.tag-size-10 {
font-size: 21px; }
// .tag-size-10 {
// font-size: 21px; }
// ul {
// &.tags {
......@@ -895,29 +895,29 @@ body.anon #searchBar {
// padding: 0;
// height: 20px; } }
.wildcard-tags {
clear: both; }
// .wildcard-tags {
// clear: both; }
ul.tags.marked-tags li, .wildcard-tags ul.tags li {
margin-bottom: 5px; }
// ul.tags.marked-tags li, .wildcard-tags ul.tags li {
// margin-bottom: 5px; }
#tagSelector div.inputs {
clear: both;
float: none;
margin-bottom: 10px; }
// #tagSelector div.inputs {
// clear: both;
// float: none;
// margin-bottom: 10px; }
.tags-page ul.tags li {
width: 160px;
margin: 5px; }
// .tags-page ul.tags li {
// width: 160px;
// margin: 5px; }
ul {
&#ab-user-tags li {
width: 160px;
margin: 5px; }
&#related-tags li {
margin: 0 5px 8px 0;
float: left;
clear: left; } }
// ul {
// &#ab-user-tags li {
// width: 160px;
// margin: 5px; }
// &#related-tags li {
// margin: 0 5px 8px 0;
// float: left;
// clear: left; } }
// .tag-left {
// cursor: pointer;
......@@ -949,28 +949,28 @@ ul {
// font-family: Arial;
// color: #717179; }
.deletable-tag {
margin-right: 3px;
white-space: nowrap;
border-top-right-radius: 4px;
border-bottom-right-radius: 4px;
-moz-border-radius-topright: 4px;
-moz-border-radius-bottomright: 4px;
-webkit-border-bottom-right-radius: 4px;
-webkit-border-top-right-radius: 4px; }
// .deletable-tag {
// margin-right: 3px;
// white-space: nowrap;
// border-top-right-radius: 4px;
// border-bottom-right-radius: 4px;
// -moz-border-radius-topright: 4px;
// -moz-border-radius-bottomright: 4px;
// -webkit-border-bottom-right-radius: 4px;
// -webkit-border-top-right-radius: 4px; }
.tags {
a.tag-right, span.tag-right {
color: #585858;
text-decoration: none; }
a:hover {
color: #1A1A1A; } }
// .tags {
// a.tag-right, span.tag-right {
// color: #585858;
// text-decoration: none; }
// a:hover {
// color: #1A1A1A; } }
.users-page h1, .tags-page h1 {
float: left; }
// .users-page h1, .tags-page h1 {
// float: left; }
.main-page h1 {
margin-right: 5px; }
// .main-page h1 {
// margin-right: 5px; }
// .delete-icon {
// margin-top: -1px;
......@@ -997,22 +997,22 @@ ul {
// &:hover {
// background: #b32f2f; } }
.tag-number {
font-weight: normal;
float: left;
font-size: 16px;
color: #5d5d5d; }
// .tag-number {
// font-weight: normal;
// float: left;
// font-size: 16px;
// color: #5d5d5d; }
.badges .tag-number {
float: none;
display: inline;
padding-right: 15px; }
// .badges .tag-number {
// float: none;
// display: inline;
// padding-right: 15px; }
.section-title {
color: #7ea9b3;
font-family: 'Yanone Kaffeesatz',sans-serif;
font-weight: bold;
font-size: 24px; }
// .section-title {
// color: #7ea9b3;
// font-family: 'Yanone Kaffeesatz',sans-serif;
// font-weight: bold;
// font-size: 24px; }
// #fmask {
// margin-bottom: 30px;
......@@ -1841,9 +1841,9 @@ ul {
margin-right: 4px;
display: inline; } }
.tabBar-tags {
width: 270px;
margin-bottom: 15px; }
// .tabBar-tags {
// width: 270px;
// margin-bottom: 15px; }
a {
&.medal {
......@@ -2100,10 +2100,10 @@ a {
font-weight: bold;
font-family: sans-serif; } }
del {
color: #C34719;
.post-tag {
color: #C34719; } }
// del {
// color: #C34719;
// .post-tag {
// color: #C34719; } }
ins {
.post-tag, p {
......@@ -2274,8 +2274,8 @@ label.retag-error {
font-weight: bold;
text-decoration: none; }
.narrow .tags {
float: left; }
// .narrow .tags {
// float: left; }
.user-action-1 {
font-weight: bold;
......@@ -2518,25 +2518,25 @@ ul.form-horizontal-rows {
font-weight: bold;
vertical-align: top; }
ul {
&.post-tags {
margin-left: 3px;
li {
margin-top: 4px;
margin-bottom: 3px; } }
&.post-retag {
margin-bottom: 0px;
margin-left: 5px; } }
// ul {
// &.post-tags {
// margin-left: 3px;
// li {
// margin-top: 4px;
// margin-bottom: 3px; } }
// &.post-retag {
// margin-bottom: 0px;
// margin-left: 5px; } }
#question-controls .tags {
margin: 0 0 3px 0; }
// #question-controls .tags {
// margin: 0 0 3px 0; }
#tagSelector {
padding-bottom: 2px;
margin-bottom: 0; }
// #tagSelector {
// padding-bottom: 2px;
// margin-bottom: 0; }
#related-tags {
padding-left: 3px; }
// #related-tags {
// padding-left: 3px; }
#hideIgnoredTagsControl {
margin: 5px 0 0 0;
......@@ -2666,8 +2666,8 @@ a.edit {
.pln {
color: #000; }
.tag {
color: #008; }
// .tag {
// color: #008; }
.atn {
color: #606; }
......
sass/discussion/_questions.scss
......@@ -72,30 +72,6 @@ div.question-list-header {
div.tags-list {
ul.tags {
display: inline;
li {
span.delete-icon, div.delete-icon {
@include border-radius(0 4px 4px 0);
background: #555;
color: #eee;
cursor: pointer;
float: none;
display: inline;
clear: none;
left: 10px;
padding: 3px 6px;
position: relative;
top: 1px;
opacity: 0.5;
&:hover {
opacity: 1;
}
}
}
}
}
}
}
......
sass/discussion/_sidebar.scss
div.discussion-wrapper aside {
@extend .sidebar;
@include box-shadow(inset 1px 0 0 #f6f6f6);
......@@ -7,8 +8,13 @@ div.discussion-wrapper aside {
padding: lh();
width: flex-grid(3);
h2 {
font-size: 16px;
color: #4D4D4D;
&.first {
margin-top: 0px;
}
}
h3 {
......@@ -20,14 +26,60 @@ div.discussion-wrapper aside {
width: 76%;
}
div.box {
@include box-shadow(0 1px 0 #eee);
border-bottom: 1px solid #d3d3d3;
display: block;
padding-bottom: 20px;
overflow: hidden;
&:last-child {
@include box-shadow(none);
border: 0;
}
&.contributors {
a {
@include border-radius(3px);
border: 1px solid #888;
cursor: pointer;
display: inline-block;
margin-right: 6px;
position: relative;
&:before {
@include border-radius(3px);
@include box-shadow(inset 0 0 1px 1px rgba(255,255,255,.4));
top: 1px; left: 1px; bottom: 1px; right: 1px;
content: '';
position: absolute;
}
}
img.gravatar {
@include border-radius(3px);
}
}
&.tag-selector {
ul {
margin-bottom: 10px;
display: block;
}
}
}
#displayTagFilterControl {
margin-top: 10px;
}
div.search-box {
input {
@include box-sizing(border-box);
display: inline;
}
input[type='submit'] {
@include box-shadow(none);
opacity: 0.5;
......@@ -49,7 +101,37 @@ div.discussion-wrapper aside {
input#keywords {
padding-left: 30px;
padding-right: 30px;
width: 100%;
}
input#clear {
@include box-shadow(none);
@include border-radius(5px);
border: none;
background: $mit-red;
color: #fff;
display: inline;
font-size: 10px;
margin-left: -25px;
padding: 2px 5px;
}
}
// Question view sopecific
div.follow-buttons {
margin: 20px 0;
display: block;
a.button {
@include box-sizing(border-box);
display: block;
text-align: center;
width: 100%;
}
}
}
sass/discussion/_tags.scss
ul.tags {
list-style: none;
display: inline;
li, a {
position: relative;
}
......@@ -7,21 +8,56 @@ ul.tags {
@include border-radius(4px);
background: #eee;
color: #555;
display: inline;
display: inline-block;
font-size: 12px;
margin-left: 15px;
padding: 3px 10px 5px 5px;
margin-bottom: 5px;
&:before {
border-color:transparent #eee transparent transparent;
border-style:solid;
border-width:12px 12px 12px 0;
content:"";
height:0;
left:-11px;
position:absolute;
top:0;
left:-11px;
width:0;
height:0;
border-color:transparent #eee transparent transparent;
border-style:solid;
border-width:12px 12px 12px 0;
}
span.delete-icon, div.delete-icon {
@include border-radius(0 4px 4px 0);
background: #555;
clear: none;
color: #eee;
cursor: pointer;
display: inline;
float: none;
left: 10px;
opacity: 0.5;
padding: 3px 6px;
position: relative;
top: 1px;
&:hover {
opacity: 1;
}
}
a {
color: #555;
text-decoration: none;
}
}
}
span.tag-number {
@include border-radius(3px);
background: #555;
font-size: 10px;
margin: 0 3px;
padding: 2px 5px;
color: #eee;
opacity: 0.5;
}
tos.html
......@@ -78,9 +78,7 @@ 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.).
textbooks, User Postings, or user information.
<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).
......@@ -302,6 +300,6 @@ 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> February 10, 2012</p><div>
<p><strong>Effective Date:</strong> February 20, 2012</p><div>
</div>
</section>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment