Skip to content

E
edx-platform
Commit ed090ad8 by Reda Lemeden
Options

Merged with headt

parents 5db3d4c5 30042ceb
Showing with 348 additions and 213 deletions
create_account.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div name="enroll_form" id="enroll_form"> <div name="enroll_form" id="enroll_form">
<h1>Enroll in 6.002 Circuits &amp; Electronics</h1> <h1>Enroll in 6.002 Circuits &amp; Electronics</h1>
<form name="login" method="get"> <form name="enroll" id="enroll_form" method="get">
<fieldset><% if 'error' in locals(): e = error %> <fieldset><% if 'error' in locals(): e = error %>
<div id="enroll_error" name="enroll_error"></div> <div id="enroll_error" name="enroll_error"></div>
...@@ -67,6 +67,6 @@ ...@@ -67,6 +67,6 @@
</li> </li>
</ol> </ol>
<input name="create_account_button" id="create_account_button" type="button" value="Create Account"> <input name="create_account_button" id="create_account_button" type="submit" value="Create Account">
</fieldset> </form> </fieldset> </form>
</div> </div>
homework.html
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
% for problem in homework['problems']: % for problem in homework['problems']:
<li> <li>
<h2>${ problem['name'] }</h2> <h2>${ problem['name'] }</h2>
${ problem['html'] } ${ problem['html'] }
<section> <section>
......
index.html
...@@ -85,7 +85,8 @@ $(function() { ...@@ -85,7 +85,8 @@ $(function() {
/* Handles when the user hits 'enroll'. Grabs form data. Does AJAX. /* Handles when the user hits 'enroll'. Grabs form data. Does AJAX.
Either shows error, or shows success. */ Either shows error, or shows success. */
$('#create_account_button').click(function() { $('form#enroll_form').submit(function(e) {
e.preventDefault();
var submit_data={}; var submit_data={};
$.each($("[id^=ca_]"), function(index,value){ $.each($("[id^=ca_]"), function(index,value){
submit_data[value.name]=value.value; submit_data[value.name]=value.value;
......
login.html
...@@ -3,7 +3,7 @@ ${ error } ...@@ -3,7 +3,7 @@ ${ error }
<div id="login_div"> <div id="login_div">
<h1>Log in to MITx</h1> <h1>Log in to MITx</h1>
<form name="login" action="/login" method="get"> <form id="login_form" method="post">
<div id="login_error"></div> <div id="login_error"></div>
<ol> <ol>
<li> <li>
...@@ -21,7 +21,7 @@ ${ error } ...@@ -21,7 +21,7 @@ ${ error }
</li> </li>
</ol> </ol>
<input name="submit" id="login_button" type="button" value="Log in"> <input name="submit" id="login_button" type="submit" value="Log in">
</form> </form>
<div class="lost-password"> <div class="lost-password">
......
main.html
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<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 }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 }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.treeview.js"></script>
<script type="text/javascript" src="${ settings.LIB_URL }jquery.leanModal.min.js"></script> <script type="text/javascript" src="/static/js/jquery.leanModal.min.js"></script>
<script type="text/javascript" src="/static/js/video_player.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" src="/static/js/cktsim.js"></script> <script type="text/javascript" src="/static/js/cktsim.js"></script>
......
marketing.html
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<script type="text/javascript" src="${ settings.LIB_URL }jquery-1.6.2.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 }jquery-ui-1.8.16.custom.min.js"></script>
<script type="text/javascript" src="${ settings.LIB_URL }jquery.leanModal.min.js"></script> <script type="text/javascript" src="/static/js/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 }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.treeview.js"></script-->
<!--script type="text/javascript" src="/static/js/video_player.js"></script--> <!--script type="text/javascript" src="/static/js/video_player.js"></script-->
...@@ -22,11 +22,11 @@ ...@@ -22,11 +22,11 @@
<script src="/static/js/html5shiv.js"></script> <script src="/static/js/html5shiv.js"></script>
<![endif]--> <![endif]-->
<script type="text/javascript"> <script type="text/javascript">
$(function(){ $(function(){
$("a[rel*=leanModal]").leanModal(); $("a[rel*=leanModal]").leanModal();
}); });
</script> </script>
<%block name="headextra"/> <%block name="headextra"/>
...@@ -109,7 +109,8 @@ function postJSON(url, data, callback) { ...@@ -109,7 +109,8 @@ function postJSON(url, data, callback) {
$(document).ready(function(){ $(document).ready(function(){
/* Handles when the user tries to log in. Grabs form data. Does AJAX. /* Handles when the user tries to log in. Grabs form data. Does AJAX.
Either shows error, or redirects. */ Either shows error, or redirects. */
$('#login_button').click(function() { $('form#login_form').submit(function(e) {
e.preventDefault();
var submit_data={}; var submit_data={};
$.each($("[id^=li_]"), function(index,value){ $.each($("[id^=li_]"), function(index,value){
submit_data[value.name]=value.value; submit_data[value.name]=value.value;
...@@ -128,11 +129,21 @@ $(document).ready(function(){ ...@@ -128,11 +129,21 @@ $(document).ready(function(){
); );
}); });
$('#pwd_reset_button').click(function() {
$.post('/password_reset/',{ "csrfmiddlewaretoken" : "${ csrf }", $('form#pwd_reset_form').submit(function(e) {
"email" : $('#id_email').val()}, function(data){ e.preventDefault();
$('#pwd_reset').html(data); var submit_data = {};
}); submit_data['email'] = $('#id_email').val();
postJSON('/password_reset/',
submit_data,
function(json){
if (json.success) {
$('#pwd_reset').html(json.value);
} else {
$('#pwd_error').html(json.error);
}
}
);
}); });
}); });
......
password_reset_form.html 100755 → 100644
...@@ -2,8 +2,9 @@ ...@@ -2,8 +2,9 @@
<p>Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one.</p> <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"> <form id="pwd_reset_form">
<input type='hidden' name='csrfmiddlewaretoken' value='${ csrf }' /> <div id="pwd_error"></div>
<label for="id_email">E-mail address:</label> <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" /> <input id="id_email" type="email" name="email" maxlength="75" />
<input type="submit" id="pwd_reset_button" value="Reset my password" />
</form> </form>
problem.html
<h2>${ problem['name'] }</h2> <h2>${ problem['name'] }</h2>
<p> ${ problem['html'] } </p> <section class="problem">
${ problem['html'] }
<section class="action"> <section class="action">
<input type="hidden" name="problem_id" value="${ problem['name'] }"> <input type="hidden" name="problem_id" value="${ problem['name'] }">
% if check_button: % if check_button:
<input id="check_${ id }" type="button" value="Check ${ attempts }" > <input id="check_${ id }" type="button" value="Check ${ attempts }" >
% endif % endif
% if reset_button: % if reset_button:
<input id="reset_${ id }" type="button" value="Reset ${ attempts }" > <input id="reset_${ id }" type="button" value="Reset ${ attempts }" >
% endif % endif
% if save_button: % if save_button:
<input id="save_${ id }" type="button" value="Save" > <input id="save_${ id }" type="button" value="Save" >
% endif % endif
% if answer_available: % if answer_available:
<input id="show_${ id }" type="button" value="Show Answer" > <input id="show_${ id }" type="button" value="Show Answer" >
% endif % endif
% if explain : % if explain :
<a href="/courseware/6.002_Spring_2012/${ explain }" class="new-page">Explanation</a> <a href="/courseware/6.002_Spring_2012/${ explain }" class="new-page">Explanation</a>
% endif % endif
</section> </section>
</section>
problem_ajax.html
<div id="main_${id}"></div> <section id="main_${id}" class="problems-wrapper"></section>
registration/password_reset_complete.html 100755 → 100644
File mode changed from 100755 to 100644
registration/password_reset_confirm.html 100755 → 100644
File mode changed from 100755 to 100644
registration/password_reset_done.html 100755 → 100644
{% block content %}
<h1>Password reset successful</h1> <h1>Password reset successful</h1>
<p>We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly.</p> <p>We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly.</p>
{% endblock %}
registration/password_reset_email.html 100755 → 100644
File mode changed from 100755 to 100644
registration/password_reset_form.html deleted 100755 → 0
<h1>Password reset</h1>
<p>Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one.</p>
<form action="" method="post">{% csrf_token %}
{{ form.email.errors }}
<p><label for="id_email">E-mail address:</label> {{ form.email }} <input type="submit" value="Reset my password" /></p>
</form>
sass/_base-extends.scss
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
.content { .content {
@include box-sizing(border-box); @include box-sizing(border-box);
@include box-shadow(inset 0 0 2px 3px #f3f3f3);
display: table-cell; display: table-cell;
padding: lh(); padding: lh();
vertical-align: top; vertical-align: top;
...@@ -46,8 +47,9 @@ ...@@ -46,8 +47,9 @@
} }
.sidebar { .sidebar {
@include box-shadow( inset -1px 0 0 #f6f6f6); @include box-shadow( inset 0 0 0 1px #f6f6f6);
@include box-sizing(border-box); @include box-sizing(border-box);
@include border-radius(4px 0 0 4px);
background: #e3e3e3; background: #e3e3e3;
border-right: 1px solid #d3d3d3; border-right: 1px solid #d3d3d3;
display: table-cell; display: table-cell;
...@@ -106,6 +108,7 @@ ...@@ -106,6 +108,7 @@
margin: (-$body-line-height) (-$body-line-height) $body-line-height; margin: (-$body-line-height) (-$body-line-height) $body-line-height;
font-size: 12px; font-size: 12px;
text-shadow: 0 1px 0 #fff; text-shadow: 0 1px 0 #fff;
@include box-shadow(inset 0 1px 0 #fff, inset 1px 0 0 #fff);
@extend .clearfix; @extend .clearfix;
a { a {
......
sass/_base.scss
...@@ -41,6 +41,14 @@ em { ...@@ -41,6 +41,14 @@ em {
} }
} }
a:link, a:visited {
text-decoration:none;
}
a:hover {
text-decoration:underline;
}
input[type="submit"], input[type="button"], button { input[type="submit"], input[type="button"], button {
@extend .button; @extend .button;
} }
......
sass/_courseware-sequence-nav.scss 0 → 100644
nav.sequence-nav {
@extend .topbar;
margin-bottom: $body-line-height;
ol {
a {
@extend .block-link;
}
.inactive {
background-repeat: no-repeat;
&:hover {
background-color: lighten(#F6EFD4, 3%);
}
}
.visited {
background-color: shade(#F6EFD4, 10%);
background-repeat: no-repeat;
border-color: shade(#F6EFD4, 10%);
&:hover {
background-color: #F6EFD4;
}
}
.active {
// @include box-shadow(inset -1px 0 0 darken(#F6EFD4, 20%), inset 1px 0 0 darken(#F6EFD4, 20%));
@include box-shadow(0 1px 0 #fff);
background-color: #fff;
background-repeat: no-repeat;
&:hover {
background-color: #fff;
}
}
li {
border: none;
border-right: 1px solid darken(#F6EFD4, 10%);
@include box-shadow(1px 0 0 #fff);
cursor: pointer;
display: table-cell;
padding: lh(.75);
float: left;
width: 18px;
//problem
// &.seq_problem_inactive {
// width: 14px;
// background: url('/static/images/problem-icon.png') 13px 13px no-repeat;
// @extend .inactive;
// }
// &.seq_problem_visited {
// width: 14px;
// background: shade(#F6EFD4, 4%) url('/static/images/problem-icon.png') -57px 13px no-repeat;
// &:hover {
// background-color: #F6EFD4;
// }
// }
// &.seq_problem_active {
// width: 14px;
// background: #FFFBEB url('/static/images/problem-icon.png') -22px 13px no-repeat;
// @include box-shadow(inset -1px 0 0 darken(#F6EFD4, 20%), inset 1px 0 0 darken(#F6EFD4, 20%));
// &:hover {
// background-color: #F6EFD4;
// }
// }
//video
&.seq_video_inactive {
@extend .inactive;
background-image: url('/static/images/video-icon.png');
background-position: 13px 15px;
}
&.seq_video_visited {
@extend .visited;
background-image: url('/static/images/video-icon.png');
background-position: -81px 15px;
}
&.seq_video_active {
@extend .active;
background-image: url('/static/images/video-icon.png');
background-position: -32px 15px;
}
//vertical
&.seq_vertical_inactive, &.seq_problem_inactive {
background-image: url('/static/images/vertical-icon.png');
background-position: -82px 15px;
@extend .inactive;
}
&.seq_vertical_visited, &.seq_problem_visited {
background-image: url('/static/images/vertical-icon.png');
background-position: 13px 15px;
@extend .visited;
}
&.seq_vertical_active, &.seq_problem_active {
background-image: url('/static/images/vertical-icon.png');
background-position: -35px 15px;
@extend .active;
}
}
}
ul {
float: right;
margin-right: 1px;
li {
float: left;
&.prev, &.next {
@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%);
float: right;
letter-spacing: 1px;
padding: lh(.75);
text-transform: uppercase;
cursor: pointer;
&:hover {
text-decoration: none;
color: darken(#F6EFD4, 60%);
text-decoration: none;
background: none;
}
}
}
}
}
sass/_courseware-video.scss
...@@ -132,7 +132,9 @@ section.course-content { ...@@ -132,7 +132,9 @@ section.course-content {
font-weight: bold; font-weight: bold;
span { span {
@include inline-block();
cursor: pointer; cursor: pointer;
margin-bottom: 0;
&:hover { &:hover {
color: $mit-red; color: $mit-red;
...@@ -146,7 +148,8 @@ section.course-content { ...@@ -146,7 +148,8 @@ section.course-content {
ol.subtitles { ol.subtitles {
float: left; float: left;
width: flex-grid(3, 9); width: flex-grid(3, 9);
min-height: 570px; height: 530px;
overflow: hidden;
li { li {
margin-bottom: 0px; margin-bottom: 0px;
......
sass/_courseware.scss
...@@ -86,146 +86,115 @@ div.course-wrapper { ...@@ -86,146 +86,115 @@ div.course-wrapper {
section.course-content { section.course-content {
@extend .content; @extend .content;
ol.vert-mod { p {
> li { margin-bottom: lh();
@extend .clearfix;
border-bottom: 1px solid #eee;
padding: 15px 0;
&:last-child {
border-bottom: none;
}
h2 { &:empty {
margin-top: 0; display: none;
margin-bottom: 15px; margin-bottom: 0;
}
input[type="text"] {
display: inline-block;
margin: 8px 4px 4px 10px;
}
} }
} }
ol.sequence-nav { .problem-set {
margin-bottom: $body-line-height; position: relative;
@extend .topbar; @extend .clearfix;
h2 {
margin-top: 0;
margin-bottom: 15px;
width: flex-grid(2, 9);
padding-right: flex-gutter(9);
border-right: 1px dotted #ccc;
@include box-sizing(border-box);
display: table-cell;
vertical-align: top;
a { @media screen and (max-width:910px) {
@extend .block-link; display: block;
width: auto;
}
} }
li { section.problem {
border: none;
cursor: pointer;
display: table-cell; display: table-cell;
padding: lh(.75); width: flex-grid(7, 9);
float: left; padding-left: flex-gutter(9);
//problem
&.seq_problem_inactive {
width: 14px;
background: url('/static/images/problem-icon.png') 13px 13px no-repeat;
@include box-shadow(inset -1px 0 0 darken(#F6EFD4, 10%));
&:hover { @media screen and (max-width:910px) {
background-color: lighten(#F6EFD4, 3%); display: block;
} width: auto;
}
&.seq_problem_visited {
width: 14px;
background: shade(#F6EFD4, 4%) url('/static/images/problem-icon.png') -57px 13px no-repeat;
&:hover {
background-color: #F6EFD4;
}
} }
&.seq_problem_active { span {
width: 14px; &.unanswered {
background: #FFFBEB url('/static/images/problem-icon.png') -22px 13px no-repeat; @include inline-block();
@include box-shadow(inset -1px 0 0 darken(#F6EFD4, 20%), inset 1px 0 0 darken(#F6EFD4, 20%)); background: url('/static/images/unanswered-icon.png') center center no-repeat;
height: 14px;
&:hover { position: relative;
background-color: #F6EFD4; top: 4px;
width: 14px;
} }
}
//video
&.seq_video_inactive {
width: 14px;
background: url('/static/images/video-icon.png') 13px 15px no-repeat;
@include box-shadow(inset -1px 0 0 darken(#F6EFD4, 10%));
&:hover { &.correct {
background-color: lighten(#F6EFD4, 3%); @include inline-block();
background: url('/static/images/correct-icon.png') center center no-repeat;
height: 20px;
position: relative;
top: 6px;
width: 25px;
} }
}
&.seq_video_visited { &.incorrect {
width: 14px; @include inline-block();
background: shade(#F6EFD4, 4%) url('/static/images/video-icon.png') -81px 15px no-repeat; background: url('/static/images/incorrect-icon.png') center center no-repeat;
&:hover { height: 20px;
background-color: #F6EFD4; width: 20px;
position: relative;
top: 6px;
} }
} }
}
&.seq_video_active { div {
width: 14px; > span {
background: #FFFBEB url('/static/images/video-icon.png') -32px 15px no-repeat; display: block;
@include box-shadow(inset -1px 0 0 darken(#F6EFD4, 20%),inset 1px 0 0 darken(#F6EFD4, 20%)); margin-bottom: lh(.5);
&:hover {
background-color: #F6EFD4;
}
} }
}
input[type="text"] {
display: inline-block;
}
//vertical center {
&.seq_vertical_inactive { display: block;
width: 14px; margin: lh() 0;
background: url('/static/images/vertical-icon.png') -82px 15px no-repeat; border: 1px solid #ccc;
@include box-shadow(inset -1px 0 0 darken(#F6EFD4, 10%)); padding: lh();
}
&:hover {
background-color: lighten(#F6EFD4, 3%);
}
}
&.seq_vertical_visited { section.action {
width: 14px; margin-top: lh();
background: shade(#F6EFD4, 4%) url('/static/images/vertical-icon.png') 13px 15px no-repeat; }
&:hover { }
background-color: #F6EFD4;
}
}
&.seq_vertical_active {
width: 14px;
background: #FFFBEB url('/static/images/vertical-icon.png') -35px 15px no-repeat;
@include box-shadow(inset -1px 0 0 darken(#F6EFD4, 20%), inset 1px 0 0 darken(#F6EFD4, 20%));
&:hover { section.problems-wrapper, div#seq_content {
background-color: #F6EFD4; @extend .problem-set;
} }
}
&.prev, &.next { ol.vert-mod {
@include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); > li {
background: darken(#F6EFD4, 5%); @extend .clearfix;
border-left: 1px solid darken(#f6efd4, 20%); @extend .problem-set;
color: darken(#F6EFD4, 80%); border-bottom: 1px solid #ddd;
float: right; margin-bottom: 15px;
letter-spacing: 1px; padding: 0 0 15px;
padding: lh(.75);
text-transform: uppercase;
&:hover { &:last-child {
text-decoration: none; border-bottom: none;
color: darken(#F6EFD4, 60%); margin-bottom: 0;
text-decoration: none; padding-bottom: 0;
background: none;
}
} }
} }
} }
......
sass/_layout.scss
...@@ -6,7 +6,7 @@ html { ...@@ -6,7 +6,7 @@ html {
font: $body-font-size $body-font-family; font: $body-font-size $body-font-family;
text-align: center; text-align: center;
margin: 0; margin: 0;
background: #f6f6f6; background: #f4f4f4; //#f3f1e5
div.header-wrapper { div.header-wrapper {
// @include linear-gradient(lighten($mit-red, 5%), darken($mit-red, 5%)); // @include linear-gradient(lighten($mit-red, 5%), darken($mit-red, 5%));
...@@ -28,7 +28,7 @@ html { ...@@ -28,7 +28,7 @@ html {
font-size: 20px; font-size: 20px;
font-weight: 800; font-weight: 800;
margin: 0 lh() 0 0; margin: 0 lh() 0 0;
padding: 17px lh() 17px 0; padding: 17px lh() 14px 0;
text-shadow: 0 1px 0 lighten($mit-red, 10%); text-shadow: 0 1px 0 lighten($mit-red, 10%);
line-height: lh(); line-height: lh();
} }
...@@ -44,16 +44,16 @@ html { ...@@ -44,16 +44,16 @@ html {
h2 { h2 {
float: left; float: left;
margin: 0 lh() 0 0; margin: 0 lh() 0 0;
padding: 19px lh() 12px 0; padding: 19px lh() 9px 0;
line-height: lh(); line-height: lh();
border-right: 1px solid darken($mit-red, 5%); border-right: 1px solid darken($mit-red, 5%);
a { a {
color: #fff; color: #fff;
text-decoration: none;
&:hover { &:hover {
color: rgba(#fff, .7); color: rgba(#fff, .7);
text-decoration: none;
} }
} }
} }
...@@ -61,7 +61,7 @@ html { ...@@ -61,7 +61,7 @@ html {
ul { ul {
@extend .clearfix; @extend .clearfix;
display: inline-block; display: inline-block;
padding: 19px 0 12px; padding: 19px 0 9px;
margin: 0; margin: 0;
li { li {
...@@ -72,6 +72,7 @@ html { ...@@ -72,6 +72,7 @@ html {
a { a {
color: #fff; color: #fff;
text-decoration: none;
&:hover { &:hover {
color: rgba(#fff, .7); color: rgba(#fff, .7);
...@@ -88,15 +89,17 @@ html { ...@@ -88,15 +89,17 @@ html {
section.main-content { section.main-content {
@extend .clearfix; @extend .clearfix;
@extend .wrapper; @extend .wrapper;
@include box-shadow(0 0 4px #ddd);
@include box-sizing(border-box); @include box-sizing(border-box);
@include border-radius(4px);
overflow: hidden;
background: #fff; background: #fff;
border-bottom: 1px solid #bbb; border-bottom: 1px solid #bbb;
@media screen and (min-width: 1400px) { @media screen and (min-width: 1400px) {
margin-top: lh(.5); // @include border-radius(3px);
@include border-radius(3px); @include box-shadow(0 0 4px #dfdfdf);
border: 1px solid #bbb; border: 1px solid #bbb;
margin-top: lh(.5);
} }
} }
......
sass/_leanmodal.scss
...@@ -93,7 +93,7 @@ div.leanModal_box { ...@@ -93,7 +93,7 @@ div.leanModal_box {
} }
} }
input[type="button"] { input[type="button"], input[type="submit"] {
@include button($mit-red); @include button($mit-red);
font-size: 18px; font-size: 18px;
padding: lh(.5); padding: lh(.5);
......
sass/_theme.scss
...@@ -37,14 +37,6 @@ h3 { ...@@ -37,14 +37,6 @@ h3 {
clear:both; clear:both;
} }
a:link, a:visited {
text-decoration:none;
}
a:hover {
text-decoration:underline;
}
#wrapper { #wrapper {
background: transparent url( images/css/page-vbg.jpg ) repeat-y scroll 50% 0px; background: transparent url( images/css/page-vbg.jpg ) repeat-y scroll 50% 0px;
margin:0 auto ; margin:0 auto ;
......
sass/application.scss
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
@import "leanmodal"; @import "leanmodal";
// pages // pages
@import "courseware", "courseware-video"; @import "courseware", "courseware-video", "courseware-sequence-nav";
@import "textbook"; @import "textbook";
@import "profile"; @import "profile";
@import "wiki-basic-html", "wiki-create", "wiki"; @import "wiki-basic-html", "wiki-create", "wiki";
...@@ -17,5 +17,5 @@ ...@@ -17,5 +17,5 @@
@import "askbot-original", "discussion", "discussion-questions", "discussion-tags", "question-view" ; @import "askbot-original", "discussion", "discussion-questions", "discussion-tags", "question-view" ;
// left over // left over
@import "theme"; // @import "theme";
@import "local"; // @import "local";
schematic_tutorial.html 0 → 120000
../data/problems/schematic_tutorial.html
\ No newline at end of file
schematicinput.html
<span> <span>
<input type="hidden" class="schematic" height="${height}" width="${width}" parts="${parts}" analyses="${analyses}" name="input_${id}" id="input_${id}" value="" initial_value=""/> <input type="hidden" class="schematic" height="${height}" width="${width}" parts="${parts}" analyses="${analyses}" name="input_${id}" id="input_${id}" value="" initial_value=""/>
<div id="value_${id}" style="display:none">${value}</div>
<div id="initial_value_${id}" style="display:none">${initial_value}</div> <div id="value_${id}" style="display:none">${value}</div>
<script> <div id="initial_value_${id}" style="display:none">${initial_value}</div>
$("#input_${id}").attr("value",$("#value_${id}").text());
$("#input_${id}").attr("initial_value",$("#initial_value_${id}").text()); <script>
</script> $("#input_${id}").attr("value",$("#value_${id}").text());
<span id="answer_${id}"></span> $("#input_${id}").attr("initial_value",$("#initial_value_${id}").text());
% if state == 'unsubmitted': </script>
<span id="answer_${id}"></span>
% if state == 'unsubmitted':
<span class="ui-icon ui-icon-bullet" style="display:inline-block;" id="status_${id}"></span> <span class="ui-icon ui-icon-bullet" style="display:inline-block;" id="status_${id}"></span>
% elif state == 'correct': % elif state == 'correct':
<span class="ui-icon ui-icon-check" style="display:inline-block;" id="status_${id}"></span> <span class="ui-icon ui-icon-check" style="display:inline-block;" id="status_${id}"></span>
% elif state == 'incorrect': % elif state == 'incorrect':
<span class="ui-icon ui-icon-close" style="display:inline-block;" id="status_${id}"></span> <span class="ui-icon ui-icon-close" style="display:inline-block;" id="status_${id}"></span>
% elif state == 'incomplete': % elif state == 'incomplete':
<span class="ui-icon ui-icon-close" style="display:inline-block;" id="status_${id}"></span> <span class="ui-icon ui-icon-close" style="display:inline-block;" id="status_${id}"></span>
% endif % endif
</span> </span>
seq_module.html
<ol class="sequence-nav"> <nav class="sequence-nav">
<ol>
% for t in range(1,1+len(items)):
<li class="seq_inactive" id="tt_${ t }">&nbsp;</li>
% endfor
</ol>
% for t in range(1,1+len(items)): <ul>
<li class="seq_inactive" id="tt_${ t }">&nbsp;</li> <li id="${ id }next" class="next">Next</li>
% endfor <li id="${ id }prev" class="prev">Previous</li>
</ul>
<li id="${ id }next" class="next">Next</li> </nav>
<li id="${ id }prev" class="prev">Previous</li>
</ol>
<!-- <td colspan=${ len(items) }> --> <!-- <td colspan=${ len(items) }> -->
......
textinput.html
<span> <section class="text-input">
<input type="text" name="input_${id}" id="input_${id}" value="${value}" /> <input type="text" name="input_${id}" id="input_${id}" value="${value}" />
<span id="answer_${id}"></span>
% if state == 'unsubmitted': <span id="answer_${id}"></span>
<span class="ui-icon ui-icon-bullet" style="display:inline-block;" id="status_${id}"></span>
% elif state == 'correct': % if state == 'unsubmitted':
<span class="ui-icon ui-icon-check" style="display:inline-block;" id="status_${id}"></span> <span class="unanswered" style="display:inline-block;" id="status_${id}"></span>
% elif state == 'incorrect': % elif state == 'correct':
<span class="ui-icon ui-icon-close" style="display:inline-block;" id="status_${id}"></span> <span class="correct" id="status_${id}"></span>
% elif state == 'incomplete': % elif state == 'incorrect':
<span class="ui-icon ui-icon-close" style="display:inline-block;" id="status_${id}"></span> <span class="incorrect" id="status_${id}"></span>
% endif % elif state == 'incomplete':
</span> <span class="incorrect" id="status_${id}"></span>
% endif
</section>
video.html
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</div> </div>
<ol class="subtitles"> <ol class="subtitles">
<li id="stt_n5"><div id="std_n7" onclick="title_seek(-7);"></div></li> <!-- <li id="stt_n5"><div id="std_n7" onclick="title_seek(-7);"></div></li> -->
<li id="stt_n4"><div id="std_n6" onclick="title_seek(-6);"></div></li> <li id="stt_n4"><div id="std_n6" onclick="title_seek(-6);"></div></li>
<li id="stt_n4"><div id="std_n5" onclick="title_seek(-5);"></div></li> <li id="stt_n4"><div id="std_n5" onclick="title_seek(-5);"></div></li>
<li id="stt_n4"><div id="std_n4" onclick="title_seek(-4);"></div></li> <li id="stt_n4"><div id="std_n4" onclick="title_seek(-4);"></div></li>
...@@ -42,5 +42,5 @@ ...@@ -42,5 +42,5 @@
<li id="stt_p5"><div id="std_p5" onclick="title_seek( 5);"></div></li> <li id="stt_p5"><div id="std_p5" onclick="title_seek( 5);"></div></li>
<li id="stt_p6"><div id="std_p7" onclick="title_seek( 6);"></div></li> <li id="stt_p6"><div id="std_p7" onclick="title_seek( 6);"></div></li>
<li id="stt_p6"><div id="std_p7" onclick="title_seek( 7);"></div></li> <li id="stt_p6"><div id="std_p7" onclick="title_seek( 7);"></div></li>
<li id="stt_p6"><div id="std_p7" onclick="title_seek( 8);"></div></li> <!-- <li id="stt_p6"><div id="std_p7" onclick="title_seek( 8);"></div></li> -->
</ol> </ol>
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