Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Reda Lemeden
2012-02-27 16:59:37 -05:00
parent 8d84f6efe1 4072569d71
commit aaef86843f
13 changed files with 79 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
courseware.html
View File

@@ -1,11 +1,13 @@
<%inherit file="main.html" />
<%block name="js_extra">
<!-- TODO: http://docs.jquery.com/Plugins/Validation -->
<script type="text/javascript">
$(function() {
${init}
});
</script>
</%block>
<%include file="navigation.html" args="active_page='courseware'" />

19
main.html
View File

@@ -9,11 +9,6 @@
<script type="text/javascript" src="${ settings.LIB_URL }jquery-1.6.2.min.js"></script>
<script type="text/javascript" src="${ settings.LIB_URL }jquery-ui-1.8.16.custom.min.js"></script>
<script type="text/javascript" src="${ settings.LIB_URL }swfobject/swfobject.js"></script>
<script type="text/javascript" src="${ settings.LIB_URL }jquery.treeview.js"></script>
<script type="text/javascript" src="/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/schematic.js"></script>
<script type="text/javascript" src="/static/js/cktsim.js"></script>
<!--[if lt IE 9]>
<script src="/static/js/html5shiv.js"></script>
@@ -84,6 +79,12 @@
</dl>
</div>
<script type="text/javascript" src="${ settings.LIB_URL }jquery.treeview.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/schematic.js"></script>
<script type="text/javascript" src="/static/js/cktsim.js"></script>
<script>
// Feedback form
$(function() {
@@ -109,13 +110,11 @@ $(function() {
});
});
});
</script>
<script type="text/javascript">
$(function(){
$("a[rel*=leanModal]").leanModal();
$(function(){
$("a[rel*=leanModal]").leanModal();
});
</script>
</script>
<%block name="js_extra"/>

2
marketing.html
View File

@@ -23,9 +23,7 @@
<!--script type="text/javascript" src="/static/js/video_player.js"></script-->
<!-- <script type="text/javascript" src="/static/js/schematic.js"></script> -->
<!--[if lt IE 9]>
<script src="/static/js/html5shiv.js"></script>
<![endif]-->
<%block name="headextra"/>

4
navigation.html
View File

@@ -11,8 +11,8 @@
<li class="courseware"><a href="/courseware">Courseware</a></li>
<li class="info"><a href="/info">Course Info</a></li>
<li class="book"><a href="/book">Textbook</a></li>
<li class="discussion"><a href="/discussion">Discussion</a></li>
<li class="wiki"><a href="/wiki">Wiki</a></li>
<li class="discussion"><a href="/discussion/questions">Discussion</a></li>
<li class="wiki"><a href="/wiki/view">Wiki</a></li>
<li class="profile"><a href="/profile">Profile</a></li>
</ul>
</nav>

8
sass/_info.scss
View File

@@ -27,10 +27,16 @@ div.info-wrapper {
margin: 0 flex-gutter() 0 0;
}
p {
section.update-description {
float: left;
width: flex-grid(7, 9);
margin-bottom: 0;
p {
&:last-child {
margin-bottom: 0;
}
}
}
}
}

2
sass/_profile.scss
View File

@@ -77,7 +77,7 @@ div.profile-wrapper {
width: 100%;
h2 {
border-right: 1px dotted #ccc;
border-right: 1px dashed #ddd;
@include box-sizing(border-box);
display: table-cell;
margin: 0;

6
sass/courseware/_amplifier.scss
View File

@@ -1,9 +1,10 @@
// JM MOSFET AMPLIFIER
div#graph-container {
@extend .clearfix;
border-top: 1px solid #ddd;
padding-top: lh(1.0);
canvas#graph {
background-color: rgb(60, 60, 100);
width: flex-grid(4.5, 9);
float: left;
margin-right: flex-gutter(9);
@@ -46,7 +47,6 @@ div#schematic-container {
@extend .clearfix;
canvas {
background-color: rgb(60, 60, 100);
width: flex-grid(4.5, 9);
float: left;
margin-right: flex-gutter(9);

4
sass/courseware/_courseware.scss
View File

@@ -36,7 +36,7 @@ div.course-wrapper {
margin-bottom: 15px;
width: flex-grid(2, 9);
padding-right: flex-gutter(9);
border-right: 1px dotted #ccc;
border-right: 1px dashed #ddd;
@include box-sizing(border-box);
display: table-cell;
vertical-align: top;
@@ -145,7 +145,7 @@ div.course-wrapper {
div#seq_content {
h1 {
background: none;
margin-bottom: 0;
margin-bottom: lh();
padding-bottom: 0;
border-bottom: none;
}

40
sass/courseware/_video.scss
View File

@@ -54,6 +54,7 @@ section.course-content {
section.video-controls {
@extend .clearfix;
background: #333;
position: relative;
border: 1px solid #000;
color: #ccc;
@@ -133,22 +134,47 @@ section.course-content {
float: right;
div.speeds {
border-right: 1px solid #000;
border-left: 1px solid #000;
@include box-shadow(1px 0 0 #555, inset 1px 0 0 #555);
float: left;
line-height: 46px; //height of play pause buttons
padding-right: lh();
margin-right: 0;
-webkit-font-smoothing: antialiased;
@include box-shadow(1px 0 0 #555);
border-right: 1px solid #000;
div#video_speeds {
@include inline-block();
h3 {
a {
color: #fff;
display: block;
padding: 0 lh(.5);
&:hover {
text-decoration: none;
background-color: #444;
}
}
}
ol#video_speeds {
@extend .clearfix;
background: #333;
border: 1px solid #000;
font-weight: bold;
@include inline-block();
padding: 0 lh();
position: absolute;
right: 79px;
@include box-shadow(inset 0 1px 0 #555);
span {
@include inline-block();
li {
cursor: pointer;
float: left;
margin-bottom: 0;
margin-right: lh(.5);
&:last-child {
margin-right: 0;
}
&:hover {
color: $mit-red;

2
sass/discussion/_question-view.scss
View File

@@ -100,7 +100,7 @@ div.question-header {
display: inline-block;
float: left;
width: flex-grid(1.8,8);
border-left: 1px dotted #CCC;
border-left: 1px dashed #ddd;
div.post-update-info {
@include box-sizing(border-box);

4
sass/index/_footer.scss
View File

@@ -59,6 +59,10 @@ footer {
position: relative;
top: -5px;
@media screen and (max-width: 780px) {
float: none;
}
li {
float: left;
margin-right: lh(.5);

11
video.html
View File

@@ -28,7 +28,8 @@
<div class="secondary-controls">
<div class="speeds">
Speed: <div id="video_speeds"></div>
<h3><a href="#">Speed</a></h3>
<ol id="video_speeds"></ol>
</div>
<a href="#" class="hide-subtitles">on</a>
@@ -68,6 +69,14 @@
$(this).text((link_text == 'on') ? 'off' : 'on');
return false;
});
$('.speeds ol').hide();
$('.speeds h3 a').click(function() {
$('.speeds ol').toggle();
return false;
});
});
</script>
</%block>

6
video_init.js
View File

@@ -34,9 +34,13 @@ loadNewVideo(streams["1.0"], ${ position });
function add_speed(key, stream) {
var id = 'speed_' + stream;
$("#video_speeds").append(' <span id="'+id+'">'+key+'x</span>');
$("#video_speeds").append(' <li id="'+id+'">'+key+'x</li>');
$("#"+id).click(function(){
change_video_speed(key, stream);
$(this).siblings().removeClass("active");
$(this).addClass("active");
});
}