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

Merge

Browse Source
This commit is contained in:
Reda Lemeden
2012-02-28 17:30:12 -05:00
parent 37d1ed27e7 611b4acf65
commit 7363a2fba0
9 changed files with 134 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
courseware.html
View File

@@ -4,8 +4,12 @@
<!-- TODO: http://docs.jquery.com/Plugins/Validation -->
<script type="text/javascript">
$(function() {
${init}
});
${init}
$(".sequence-nav li a").hover(function(){
$(this).siblings().toggle();
});
});
</script>
</%block>

2
main.html
View File

@@ -85,6 +85,7 @@
<script type="text/javascript" src="/static/js/schematic.js"></script>
<script type="text/javascript" src="/static/js/cktsim.js"></script>
<script>
// Feedback form
$(function() {
@@ -117,6 +118,5 @@ $(function(){
</script>
<%block name="js_extra"/>
</body>
</html>

2
sass/application.scss
View File

@@ -4,7 +4,7 @@
@import "base/reset", "base/font-face";
@import "base/variables", "base/functions", "base/extends", "base/base";
@import "layout/layout", "layout/header", "layout/footer", "layout/leanmodal";
@import "jquery-ui-1.8.16.custom";
@import "plugins/jquery-ui-1.8.16.custom";
// pages
@import "courseware/courseware", "courseware/sidebar", "courseware/video", "courseware/sequence-nav", "courseware/amplifier";

198
sass/courseware/_sequence-nav.scss
View File

@@ -6,102 +6,150 @@ nav.sequence-nav {
display: table-row;
float: left;
width: flex-grid(7.5,9) + flex-gutter();
position: relative;
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 {
@include box-shadow(1px 0 0 #fff);
background-position: center center;
border: none;
border-right: 1px solid darken(#F6EFD4, 10%);
cursor: pointer;
display: table-cell;
padding: 14px 4px;
width: 28px;
// @media screen and (max-width: 800px) {
// padding: 12px 8px;
// }
.inactive {
background-repeat: no-repeat;
//video
&.seq_video_inactive {
@extend .inactive;
background-image: url('/static/images/sequence-nav/video-icon-normal.png');
&:hover {
background-color: lighten(#F6EFD4, 3%);
}
}
&.seq_video_visited {
@extend .visited;
background-image: url('/static/images/sequence-nav/video-icon-visited.png');
.visited {
background-color: shade(#F6EFD4, 10%);
background-repeat: no-repeat;
border-color: shade(#F6EFD4, 10%);
&:hover {
background-color: #F6EFD4;
background-position: center center;
}
}
&.seq_video_active {
@extend .active;
background-image: url('/static/images/sequence-nav/video-icon-current.png');
.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;
background-position: center;
}
}
//other
&.seq_other_inactive {
@extend .inactive;
background-image: url('/static/images/sequence-nav/document-icon-normal.png');
}
a {
@include box-shadow(1px 0 0 #fff);
background-position: center center;
border: none;
border-right: 1px solid darken(#F6EFD4, 10%);
cursor: pointer;
padding: 14px 4px;
width: 28px;
height: 17px;
&.seq_other_visited {
@extend .visited;
background-image: url('/static/images/sequence-nav/document-icon-visited.png');
}
// @media screen and (max-width: 800px) {
// padding: 12px 8px;
// }
&.seq_other_active {
@extend .active;
background-image: url('/static/images/sequence-nav/document-icon-current.png');
}
//video
&.seq_video_inactive {
@extend .inactive;
background-image: url('/static/images/sequence-nav/video-icon-normal.png');
background-position: center;
}
//vertical & problems
&.seq_vertical_inactive, &.seq_problem_inactive {
@extend .inactive;
background-image: url('/static/images/sequence-nav/list-icon-normal.png');
}
&.seq_video_visited {
@extend .visited;
background-image: url('/static/images/sequence-nav/video-icon-visited.png');
background-position: center;
}
&.seq_vertical_visited, &.seq_problem_visited {
@extend .visited;
background-image: url('/static/images/sequence-nav/list-icon-visited.png');
}
&.seq_video_active {
@extend .active;
background-image: url('/static/images/sequence-nav/video-icon-current.png');
background-position: center;
}
&.seq_vertical_active, &.seq_problem_active {
@extend .active;
background-image: url('/static/images/sequence-nav/list-icon-current.png');
}
//other
&.seq_other_inactive {
@extend .inactive;
background-image: url('/static/images/sequence-nav/document-icon-normal.png');
background-position: center;
}
&.seq_other_visited {
@extend .visited;
background-image: url('/static/images/sequence-nav/document-icon-visited.png');
background-position: center;
}
&.seq_other_active {
@extend .active;
background-image: url('/static/images/sequence-nav/document-icon-current.png');
background-position: center;
}
//vertical & problems
&.seq_vertical_inactive, &.seq_problem_inactive {
@extend .inactive;
background-image: url('/static/images/sequence-nav/list-icon-normal.png');
background-position: center;
}
&.seq_vertical_visited, &.seq_problem_visited {
@extend .visited;
background-image: url('/static/images/sequence-nav/list-icon-visited.png');
background-position: center;
}
&.seq_vertical_active, &.seq_problem_active {
@extend .active;
background-image: url('/static/images/sequence-nav/list-icon-current.png');
background-position: center;
}
}
p {
position: absolute;
display: none;
background: #B3A87E;
padding: 6px;
white-space: pre-wrap;
z-index: 99;
margin: 4px 0 0 -5px;
text-shadow: 0 -1px 0 darken(#B3A87E, 10%);
color: #fff;
&:empty {
background: none;
&::after {
display: none;
}
}
&::after {
background: #B3A87E;
content: " ";
display: block;
height: 10px;
position: absolute;
top: -5px;
left: 18px;
@include transform(rotate(45deg));
@include transition();
width: 10px;
}
}
}
}

27
sass/courseware/_video.scss
View File

@@ -167,33 +167,6 @@ section.course-content {
@include inline-block();
}
}
// 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);
// li {
// cursor: pointer;
// float: left;
// margin-bottom: 0;
// margin-right: lh(.5);
// &:last-child {
// margin-right: 0;
// }
// &:hover {
// color: $mit-red;
// }
// }
// }
}
a.hide-subtitles {

0
sass/_jquery-ui-1.8.16.custom.scss → sass/plugins/_jquery-ui-1.8.16.custom.scss
View File

7
seq_module.html
View File

@@ -1,7 +1,7 @@
<nav class="sequence-nav">
<ol>
% for t in range(1,1+len(items)):
<li class="seq_inactive" id="tt_${ t }">&nbsp;</li>
<li><a href="#" class="seq_inactive" id="tt_${ t }"></a></li>
% endfor
</ol>
@@ -11,8 +11,5 @@
</ul>
</nav>
<!-- <td colspan=${ len(items) }> -->
<div id="seq_content"></div>
<!-- </td> -->
<div id="seq_content"></div>

2
seq_module.js
View File

@@ -54,7 +54,7 @@ function ${ id }goto(i) {
function ${ id }setup_click(i) {
$('#tt_'+i).click(function(eo) { ${ id }goto(i);});
$('#tt_'+i).addClass("seq_"+${ id }types[i]+"_inactive");
$('#tt_'+i).attr("title", ${ id }titles[i-1]);
$('#tt_'+i).parent().append("<p>" + ${ id }titles[i-1] + "</p>");
}

8
video.html
View File

@@ -69,14 +69,6 @@
$(this).text((link_text == 'on') ? 'off' : 'on');
return false;
});
/* $('.speeds ol').hide();
$('.speeds h3 a').click(function() {
$('.speeds ol').toggle();
return false;
});*/
});
</script>
</%block>