Skip to content

E
edx-platform
Commit 439f6298 by Reda Lemeden
Options

Merge with head

parents 4b419b6f e6e608d8
Showing with 217 additions and 55 deletions
.DS_Store
No preview for this file type
6002x-faq.html
...@@ -18,6 +18,53 @@ This set of questions and answers accompanies MIT’s February 13, ...@@ -18,6 +18,53 @@ This set of questions and answers accompanies MIT’s February 13,
6.002x: Circuits and Electronics. 6.002x: Circuits and Electronics.
</p> </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> <h2>
What is <i>MITx</i>?</h2> What is <i>MITx</i>?</h2>
......
accordion_init.js
$("#accordion").accordion({ $("#accordion").accordion({
active: ${ active_chapter }, active: ${ active_chapter },
autoHeight: false header: 'h3',
autoHeight: false,
});
$("#open_close_accordion a").click(function(){
if ($(".course-wrapper").hasClass("closed")){
$(".course-wrapper").removeClass("closed");
} else {
$(".course-wrapper").addClass("closed");
}
}); });
$('.ui-accordion').bind('accordionchange', function(event, ui) { $('.ui-accordion').bind('accordionchange', function(event, ui) {
......
activation_email.txt
...@@ -6,4 +6,5 @@ into your web browser's address bar: ...@@ -6,4 +6,5 @@ into your web browser's address bar:
http://${ site }/activate/${ key } http://${ site }/activate/${ key }
If you didn't request this, you don't need to do anything; you won't 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.
courseware.html
...@@ -27,9 +27,16 @@ ...@@ -27,9 +27,16 @@
<section class="main-content"> <section class="main-content">
<div class="course-wrapper"> <div class="course-wrapper">
<section class="course-index">
<div id="open_close_accordion">
<h2>Courseware Index</h2>
<a href="#">close</a>
</div>
<div id="accordion"> <div id="accordion">
${accordion} ${accordion}
</div> </div>
</section>
<section class="course-content"> <section class="course-content">
${content} ${content}
......
mitx_help.html
...@@ -5,7 +5,10 @@ ...@@ -5,7 +5,10 @@
<section class="help-email"> <section class="help-email">
<h2>Help &amp; Feedback</h2> <h2>Help &amp; Feedback</h2>
<p> If run into problems signing up for the web site which you <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> <dl>
<dt>System-related questions</dt> <dt>System-related questions</dt>
<dd><a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a></dd> <dd><a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a></dd>
......
profile.html
...@@ -91,49 +91,45 @@ $(function() { ...@@ -91,49 +91,45 @@ $(function() {
<div id="grade-detail-graph" style="width:650px;height:200px;"></div> <div id="grade-detail-graph" style="width:650px;height:200px;"></div>
<ol> <ol class="chapters">
<% %for chapter in chapters:
lastChapter = None %if not chapter['chapter'] == "hidden":
%>
% for hw in homeworks:
<li> <li>
%if hw['chapter'] != lastChapter: <h2><a href="${reverse('courseware_chapter', args=format_url_params([chapter['course'], chapter['chapter']])) }">
<h2><a href="${reverse('courseware_chapter', args=format_url_params([hw['course'], hw['chapter']])) }"> ${ chapter['chapter'] }</a></h2>
${ hw['chapter'] }</a></h2>
<% lastChapter = hw['chapter'] %>
%else:
<h2>-</h2>
%endif
<div class="scores"> <ol class="sections">
<h3><a href="${reverse('courseware_section', args=format_url_params([hw['course'], hw['chapter'], hw['section']])) }"> %for section in chapter['sections']:
<li>
<% <%
earned = hw['section_total'][0] earned = section['section_total'][0]
total = hw['section_total'][1] total = section['section_total'][1]
percentageString = "{0:.0%}".format( float(earned)/total) if earned > 0 else "" 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> <h3><a href="${reverse('courseware_section', args=format_url_params([chapter['course'], chapter['chapter'], section['section']])) }">
%if len(hw['scores']) > 0: ${ section['section'] }</a> ${"({0}/{1}) {2}".format( earned, total, percentageString )}</h3>
%if hw['graded']: ${section['subtitle']}
Problem Scores: %if 'due' in section and section['due']!="":
%else: due ${section['due']}
Practice Scores:
%endif
% for score in hw['scores']:
<li>${ score[0] }/${ score[1] }</li>
% endfor
%endif %endif
</ul>
</div> %if len(section['scores']) > 0:
</li> <ol class="scores">
% endfor ${ "Problem Scores: " if section['graded'] else "Practice Scores: "}
%for score in section['scores']:
<li class="score">${ score[0] }/${ score[1] }</li>
%endfor
</ol> </ol>
%endif
</li> <!--End section-->
%endfor
</ol> <!--End sections-->
</li> <!--End chapter-->
%endif
%endfor
</ol> <!--End chapters-->
</section> </section>
<section class="user-info"> <section class="user-info">
......
sass/reademe.md → sass/README
...@@ -5,7 +5,12 @@ $ gem install sass ...@@ -5,7 +5,12 @@ $ gem install sass
We are also using Bourbon with sass. They are a generic set of mixins, and functions that allow for more rapid development of CSS3. Find out more about bourbon here: https://github.com/thoughtbot/bourbon We are also using Bourbon with sass. They are a generic set of mixins, and functions that allow for more rapid development of CSS3. Find out more about bourbon here: https://github.com/thoughtbot/bourbon
Then to generate Sass files cd to templates directory and watch the sass files with: Then to generate Sass files cd to templates directory and watch the sass files for developement:
$ sass --watch sass:../static/css/ -r ./sass/bourbon/lib/bourbon.rb $ sass --watch sass:../static/css/ -r ./sass/bourbon/lib/bourbon.rb
This will automatically generate the CSS files on save. To generate a compressed css file for production:
$ sass --watch sass:../static/css/ -r ./sass/bourbon/lib/bourbon.rb --style :compressed
These will automatically generate the CSS files on save.
sass/_profile.scss
...@@ -57,31 +57,50 @@ div.profile-wrapper { ...@@ -57,31 +57,50 @@ div.profile-wrapper {
@extend .top-header; @extend .top-header;
} }
ol { > ol {
list-style: none; list-style: none;
border-top: 1px solid #e3e3e3;
margin-top: lh();
> li { > li {
border-bottom: 1px solid #e3e3e3; border-bottom: 1px solid #e3e3e3;
padding: lh() 0; padding: lh() 0;
width: 100%;
display: table;
@extend .clearfix; @extend .clearfix;
h2 { h2 {
float: left; display: table-cell;
padding: 0; padding: 0;
margin: 0; margin: 0;
width: flex-grid(2, 9); 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 { ol.sections {
float: left; padding-left: flex-gutter(9);
display: table-cell;
list-style: none;
width: flex-grid(7, 9); width: flex-grid(7, 9);
> li {
padding:0 0 lh() 0;
&:first-child {
padding-top: 0;
}
&:last-child {
border-bottom: 0;
}
h3 { h3 {
color: #666; color: #666;
} }
ul { ol {
list-style: none; list-style: none;
li { li {
...@@ -92,6 +111,7 @@ div.profile-wrapper { ...@@ -92,6 +111,7 @@ div.profile-wrapper {
} }
} }
} }
}
} }
} }
sass/courseware/_courseware.scss
...@@ -5,9 +5,17 @@ div.course-wrapper { ...@@ -5,9 +5,17 @@ div.course-wrapper {
list-style: none; list-style: none;
} }
.tran {
@include transition( all, .2s, $ease-in-out-quad);
}
section.course-content { section.course-content {
@extend .content; @extend .content;
h1 {
@extend .top-header;
}
p { p {
margin-bottom: lh(); margin-bottom: lh();
...@@ -17,6 +25,12 @@ div.course-wrapper { ...@@ -17,6 +25,12 @@ div.course-wrapper {
} }
} }
ul {
li {
margin-bottom: lh(.5);
}
}
.problem-set { .problem-set {
position: relative; position: relative;
@extend .clearfix; @extend .clearfix;
...@@ -102,7 +116,6 @@ div.course-wrapper { ...@@ -102,7 +116,6 @@ div.course-wrapper {
} }
} }
section.problems-wrapper, div#seq_content { section.problems-wrapper, div#seq_content {
@extend .problem-set; @extend .problem-set;
} }
...@@ -117,6 +130,15 @@ div.course-wrapper { ...@@ -117,6 +130,15 @@ div.course-wrapper {
} }
} }
div#seq_content {
h1 {
background: none;
margin-bottom: 0;
padding-bottom: 0;
border-bottom: none;
}
}
ol.vert-mod { ol.vert-mod {
> li { > li {
@extend .clearfix; @extend .clearfix;
...@@ -133,4 +155,34 @@ div.course-wrapper { ...@@ -133,4 +155,34 @@ div.course-wrapper {
} }
} }
} }
&.closed {
section.course-index {
width: flex-grid(.6);
div#open_close_accordion {
padding: 0;
a {
background-image: url('/static/images/slide-right-icon.png');
}
h2 {
visibility: hidden;
width: 10px;
padding: 0;
}
}
div#accordion {
visibility: hidden;
width: 10px;
padding: 0;
}
}
section.course-content {
width: flex-grid(11.5) + flex-gutter();
}
}
} }
sass/courseware/_sidebar.scss
div#accordion { section.course-index {
@extend .sidebar; @extend .sidebar;
@extend .tran;
div#open_close_accordion { 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;
}
a {
width: 16px;
text-indent: -9999px;
height: 16px;
position: absolute; position: absolute;
right: 0px; padding: 8px;
width: 20px; top: -12px;
height: 20px; right: -1px;
background: #ccc; border: 1px solid #D3D3D3;
border: 1px solid black; background: #eee url('/static/images/slide-left-icon.png') center center no-repeat;
right: -22px; @include border-radius(3px 0 0 3px);
top: 5px;
&:hover {
background-color: white;
}
}
} }
div#accordion {
h3 { h3 {
overflow: hidden; overflow: hidden;
margin: 0; margin: 0;
...@@ -74,4 +94,5 @@ div#accordion { ...@@ -74,4 +94,5 @@ div#accordion {
} }
} }
} }
}
} }
sass/courseware/_video.scss
...@@ -88,6 +88,7 @@ section.course-content { ...@@ -88,6 +88,7 @@ section.course-content {
li { li {
float: left; float: left;
margin-bottom: 0;
a { a {
@include box-shadow(1px 0 0 #555); @include box-shadow(1px 0 0 #555);
......
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