diff --git a/Lab2A.html b/Lab2A.html new file mode 120000 index 0000000000..3eeed8320d --- /dev/null +++ b/Lab2A.html @@ -0,0 +1 @@ +../data/problems/Lab2A.html \ No newline at end of file diff --git a/accordion.html b/accordion.html index b9502acb9c..a94f738d29 100644 --- a/accordion.html +++ b/accordion.html @@ -1,3 +1,7 @@ +<%! + from django.core.urlresolvers import reverse +%> + <%def name="make_chapter(chapter)">

${chapter['name']}

@@ -9,16 +13,12 @@ % endif > - +

${section['name']}

${section['format']} - % if 'time' in section and section['time']!="": - (${int(section['time'])/60} min) - % endif - % if 'due' in section and section['due']!="": due ${section['due']} % endif diff --git a/courseware.html b/courseware.html index bce8589d6c..0867ea9eb6 100644 --- a/courseware.html +++ b/courseware.html @@ -23,7 +23,7 @@ }); -<%include file="navigation.html" /> +<%include file="navigation.html" args="active_page='courseware'" />

diff --git a/create_account.html b/create_account.html index dd0ed7f9f9..0b15a323e2 100644 --- a/create_account.html +++ b/create_account.html @@ -9,56 +9,52 @@
    -
  1. +
    2. -
  2. +
    4. -
  4. - +
  5. + - +
    Nickname you'd like to use on forums.
    6. - -
  6. - +
  7. + - +
    If you would like us to give you a certificate of completion at the end, we need your full legal name, as you would like it to appear on the certificate (e.g. "John Smith, Jr").
    8. -
  8. +
  9. - - +
    Preferred format is city, state, country (so for us, "Cambridge, Massachusetts, USA").
    10. -
  10. +
  11. - +
    Please let us know what language you'd most like to see the content in (even if not your native). We're working on translations and internationalization.
  12. - +
  13. + I agree to the Honor code.*
    • Not engage in any activities that would dishonestly improve my results, or improve or hurt those of others.
    • Never post answers to problems.
      • diff --git a/help.html b/help.html index a45d7add3c..175c6a9252 100644 --- a/help.html +++ b/help.html @@ -1,24 +1,37 @@ <%inherit file="main.html" /> -<%include file="navigation.html" /> +<%include file="navigation.html" args="active_page='help'"/>

      Help

      -

      If you need help, first try asking a question in the forums and in the IRC channel (irc.mitx.org, channel #6002). As the semester starts, we will add a Frequently Asked Questions section.

      +
      +

      Self-help

      -

      If you can't solve your problems with self-help, we have several e-mail addresses set up:

      + +
      -
      -
      technical@mitx.mit.edu
      -
      System-related questions
      -
      content@mitx.mit.edu
      -
      Content-related questions
      -
      bugs@mitx.mit.edu
      -
      Bug reports
      -
      suggestions@mitx.mit.edu
      -
      Suggestions
      -
      +
      +

      Help email

      +

      If you can't solve your problems with self-help, we have several + e-mail addresses set up:

      -

      Please bear in mind that while we read them, we do not expect to have time to respond to all e-mails.

      +
      +
      System-related questions
      +
      technical@mitx.mit.edu
      +
      Content-related questions
      +
      content@mitx.mit.edu
      +
      Bug reports
      +
      bugs@mitx.mit.edu
      +
      Suggestions
      +
      suggestions@mitx.mit.edu
      +
      + +

      Please bear in mind that while we read them, we do not expect to + have time to respond to all e-mails.

      +
      diff --git a/homework.html b/homework.html index 4aae9095e8..058f513280 100644 --- a/homework.html +++ b/homework.html @@ -4,6 +4,7 @@ % for problem in homework['problems']:

    • ${ problem['name'] }

      + ${ problem['html'] }
      diff --git a/info.html b/info.html index 5867feb021..4f5336432b 100644 --- a/info.html +++ b/info.html @@ -1,13 +1,13 @@ <%inherit file="main.html" /> -<%include file="navigation.html" /> +<%include file="navigation.html" args="active_page='info'" />
      -
      -
      + + + + + -<%include file="navigation.html" /> + +<%include file="navigation.html" args="active_page='profile'" />
      + +
      +

      Course Progress

      + +
      + +
        + <% + lastChapter = None + %> + % for hw in homeworks: +
      1. + %if hw['chapter'] != lastChapter: +

        + ${ hw['chapter'] }

        + <% lastChapter = hw['chapter'] %> + %else: +

        -

        + %endif + +
        +

        + <% + earned = hw['section_total'][0] + total = hw['section_total'][1] + percentageString = "{0:.0%}".format( float(earned)/total) if earned > 0 else "" + %> + ${ hw['section'] } ${"({0}/{1}) {2}".format( earned, total, percentageString )}

        + ${hw['subtitle']} + % if 'due' in hw and hw['due']!="": + due ${hw['due']} + % endif + +
          + %if len(hw['scores']) > 0: + %if hw['graded']: + Problem Scores: + %else: + Practice Scores: + %endif + % for score in hw['scores']: +
        • ${ score[0] }/${ score[1] }
          • + % endfor + %endif +
        +
        +
        2. + % endfor +
      +
      +
      - -
      -

      Course Progress

      - - - -
        - % for hw in homeworks: -
      1. -

        ${ hw['chapter'] }

        -

        ${ hw['section'] }

        - -
          - % for score in hw['scores']: -
        • ${ score[0] }/${ score[1] }
          • - % endfor -
        -
        2. - % endfor -
      -
+ diff --git a/profile_graphs.js b/profile_graphs.js new file mode 100644 index 0000000000..80eb9dc3b0 --- /dev/null +++ b/profile_graphs.js @@ -0,0 +1,126 @@ +<%! + import json +%> + +$(function () { + function showTooltip(x, y, contents) { + $('
' + contents + '
').css( { + position: 'absolute', + display: 'none', + top: y + 5, + left: x + 5, + border: '1px solid #fdd', + padding: '2px', + 'background-color': '#fee', + opacity: 0.90 + }).appendTo("body").fadeIn(200); + } + + /* -------------------------------- Grade detail graph -------------------------------- */ + var colors = [$.color.parse("#E8B800"), $.color.parse("#A0CEFA"), $.color.parse("#BD3738"), $.color.parse("#429A2E")]; + //var colors = [$.color.parse("#1B2045"), $.color.parse("#557a00"), $.color.parse("#F5600"), $.color.parse("#FEBA2C")]; + //var colors = [$.color.parse("#E7C856"), $.color.parse("#CD462E"), $.color.parse("#B01732"), $.color.parse("#41192A")]; + //var colors = [$.color.parse("#434F5E"), $.color.parse("#BEF731"), $.color.parse("#FB5455"), $.color.parse("#44C4B7")]; + //var colors = [$.color.parse("#147A7D"), $.color.parse("#C0C900"), $.color.parse("#C9005B"), $.color.parse("#FCF9A5")]; + + + + var series = []; + var ticks = []; //These are the indices and x-axis labels for the data + var bottomTicks = []; //Labels on the bottom + var detail_tooltips = {}; //This an dictionary mapping from 'section' -> array of detail_tooltips + var droppedScores = []; //These are the datapoints to indicate assignments which aren't factored into the total score + detail_tooltips['Dropped Scores'] = []; + <% + tickIndex = 1 + sectionSpacer = 0.5 + sectionIndex = 0 + %> + %for section in grade_summary: + %if 'subscores' in section: ##This is for sections like labs or homeworks, with several smaller components and a total + series.push({label: "${section['category']}", + data: ${ json.dumps( [[i + tickIndex, score['percentage']] for i,score in enumerate(section['subscores'])] ) }, + color: colors[${sectionIndex}].toString(), + }); + ticks = ticks.concat( ${ json.dumps( [[i + tickIndex, str(i + 1)] for i,score in enumerate(section['subscores'])] ) } ); + bottomTicks.push( [ ${tickIndex + len(section['subscores'])/2}, "${section['category']}" ] ); + detail_tooltips["${section['category']}"] = ${ json.dumps([score['summary'] for score in section['subscores']] ) }; + + droppedScores = droppedScores.concat(${ json.dumps( [[tickIndex + index, 0.05] for index in section['dropped_indices']]) }); + <% dropExplanation = "The lowest {0} {1} scores are dropped".format( len(section['dropped_indices']), section['category'] ) %> + detail_tooltips['Dropped Scores'] = detail_tooltips['Dropped Scores'].concat( ${json.dumps( [dropExplanation] * len(section['dropped_indices']) )} ); + + <% tickIndex += len(section['subscores']) + sectionSpacer %> + + ##Now put on the aggregate score + series.push({label: "${section['category']} Total", + data: [[${tickIndex}, ${section['totalscore']['score']}]], + color: colors[${sectionIndex}].toString(), + }); + ticks = ticks.concat( [ [${tickIndex}, "Total"] ] ); + detail_tooltips["${section['category']} Total"] = [ "${section['totalscore']['summary']}" ]; + <% tickIndex += 1 + sectionSpacer %> + + %else: ##This is for sections like midterm or final, which have no smaller components + series.push({label: "${section['category']}", + data: [[${tickIndex}, ${section['totalscore']['score']}]], + color: colors[${sectionIndex}].toString(), + }); + %if section['category'] == "Midterm": + bottomTicks = bottomTicks.concat( [ [${tickIndex}, "${section['category']}"] ] ); + %else: + ticks = ticks.concat( [ [${tickIndex}, "${section['category']}"] ] ); + %endif + + detail_tooltips["${section['category']}"] = [ "${section['totalscore']['summary']}" ]; + + <% tickIndex += 1 + sectionSpacer %> + %endif + <%sectionIndex += 1 %> + %endfor + + //Alwasy be sure that one series has the xaxis set to 2, or the second xaxis labels won't show up + series.push( {label: 'Dropped Scores', data: droppedScores, points: {symbol: "cross", show: true, radius: 3}, bars: {show: false}, color: "red", xaxis: 2} ); + + var options = { + series: {lines: {show: false, steps: false }, + bars: {show: true, barWidth: 0.6, align: 'center', lineWidth: 1},}, + xaxis: {tickLength: 0, min: 0.0, max: ${tickIndex - sectionSpacer}}, + xaxes: [{ticks: ticks}, {ticks: bottomTicks}], + yaxis: {ticks: [[1, "100%"], [0.87, "A 87%"], [0.7, "B 70%"], [0.6, "C 60%"], [0, "0%"]], min: 0.0, max: 1.0, labelWidth: 50}, + grid: { hoverable: true, clickable: true, borderWidth: 1, + markings: [ {yaxis: {from: 0.87, to: 1 }, color: "#EBFFD5"}, {yaxis: {from: 0.7, to: 0.87 }, color: "#E6FFFF"}, + {yaxis: {from: 0.6, to: 0.7 }, color: "#FFF2E3"}, ] }, + legend: {show: false}, + }; + + if ($("#grade-detail-graph").length > 0) { + $.plot($("#grade-detail-graph"), series, options); + } + + var previousPoint = null; + $("#grade-detail-graph").bind("plothover", function (event, pos, item) { + $("#x").text(pos.x.toFixed(2)); + $("#y").text(pos.y.toFixed(2)); + if (item) { + if (previousPoint != item.dataIndex) { + previousPoint = item.dataIndex; + + $("#tooltip").remove(); + + if (item.series.label in detail_tooltips) { + var series_tooltips = detail_tooltips[item.series.label]; + if (item.dataIndex < series_tooltips.length) { + var x = item.datapoint[0].toFixed(2), y = item.datapoint[1].toFixed(2); + + showTooltip(item.pageX, item.pageY, series_tooltips[item.dataIndex]); + } + } + + } + } else { + $("#tooltip").remove(); + previousPoint = null; + } + }); +}); diff --git a/sass/_askbot-original.scss b/sass/_askbot-original.scss index 461bc05176..02d50862b3 100644 --- a/sass/_askbot-original.scss +++ b/sass/_askbot-original.scss @@ -972,30 +972,30 @@ ul { .main-page h1 { margin-right: 5px; } -.delete-icon { - margin-top: -1px; - float: left; - height: 21px; - width: 18px; - display: block; - line-height: 20px; - text-align: center; - background: #bbcdcd; - cursor: default; - color: #fff; - border-top: #cfdbdb 1px solid; - font-family: Arial; - 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; - text-shadow: 0px 1px 0px #7ea0a0; - -moz-text-shadow: 0px 1px 0px #7ea0a0; - -webkit-text-shadow: 0px 1px 0px #7ea0a0; - &:hover { - background: #b32f2f; } } +// .delete-icon { +// margin-top: -1px; +// float: left; +// height: 21px; +// width: 18px; +// display: block; +// line-height: 20px; +// text-align: center; +// background: #bbcdcd; +// cursor: default; +// color: #fff; +// border-top: #cfdbdb 1px solid; +// font-family: Arial; +// 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; +// text-shadow: 0px 1px 0px #7ea0a0; +// -moz-text-shadow: 0px 1px 0px #7ea0a0; +// -webkit-text-shadow: 0px 1px 0px #7ea0a0; +// &:hover { +// background: #b32f2f; } } .tag-number { font-weight: normal; diff --git a/sass/_base-extends.scss b/sass/_base-extends.scss index de1f917fca..c8c5e4b687 100644 --- a/sass/_base-extends.scss +++ b/sass/_base-extends.scss @@ -39,6 +39,7 @@ .content { @include box-sizing(border-box); + @include box-shadow(inset 0 0 2px 3px #f3f3f3); display: table-cell; padding: lh(); vertical-align: top; @@ -46,8 +47,9 @@ } .sidebar { - @include box-shadow( inset -1px 0 0 #f6f6f6); + @include box-shadow( inset 0 0 0 1px #f6f6f6); @include box-sizing(border-box); + @include border-radius(4px 0 0 4px); background: #e3e3e3; border-right: 1px solid #d3d3d3; display: table-cell; @@ -106,6 +108,7 @@ margin: (-$body-line-height) (-$body-line-height) $body-line-height; font-size: 12px; text-shadow: 0 1px 0 #fff; + @include box-shadow(inset 0 1px 0 #fff, inset 1px 0 0 #fff); @extend .clearfix; a { diff --git a/sass/_base.scss b/sass/_base.scss index a703cf208e..8ea0957ac3 100644 --- a/sass/_base.scss +++ b/sass/_base.scss @@ -41,6 +41,26 @@ em { } } +a { + color: $mit-red; + + &:link { + color: $mit-red; + } + + &:visited { + color: darken($mit-red, 10%); + } + + &:link, &:visited { + text-decoration:none; + } + + &:hover, &:focus { + text-decoration:underline; + } +} + input[type="submit"], input[type="button"], button { @extend .button; } diff --git a/sass/_courseware-sequence-nav.scss b/sass/_courseware-sequence-nav.scss new file mode 100644 index 0000000000..fb2534c4f5 --- /dev/null +++ b/sass/_courseware-sequence-nav.scss @@ -0,0 +1,156 @@ +nav.sequence-nav { + @extend .topbar; + margin-bottom: $body-line-height; + + ol { + display: table-row; + float: left; + width: flex-grid(7.5,9) + flex-gutter(); + + 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; + // } + + //video + &.seq_video_inactive { + @extend .inactive; + background-image: url('/static/images/sequence-nav/video-icon-normal.png'); + } + + &.seq_video_visited { + @extend .visited; + background-image: url('/static/images/sequence-nav/video-icon-visited.png'); + } + + &.seq_video_active { + @extend .active; + background-image: url('/static/images/sequence-nav/video-icon-current.png'); + } + + //other + &.seq_other_inactive { + @extend .inactive; + background-image: url('/static/images/sequence-nav/document-icon-normal.png'); + } + + &.seq_other_visited { + @extend .visited; + background-image: url('/static/images/sequence-nav/document-icon-visited.png'); + } + + &.seq_other_active { + @extend .active; + background-image: url('/static/images/sequence-nav/document-icon-current.png'); + } + + //vertical & problems + &.seq_vertical_inactive, &.seq_problem_inactive { + @extend .inactive; + background-image: url('/static/images/sequence-nav/list-icon-normal.png'); + } + + &.seq_vertical_visited, &.seq_problem_visited { + @extend .visited; + background-image: url('/static/images/sequence-nav/list-icon-visited.png'); + } + + &.seq_vertical_active, &.seq_problem_active { + @extend .active; + background-image: url('/static/images/sequence-nav/list-icon-current.png'); + } + + } + } + + ul { + float: right; + margin-right: 1px; + width: flex-grid(1.5, 9); + display: table-row; + + li { + + &.prev, &.next { + // color: darken(#F6EFD4, 80%); + // letter-spacing: 1px; + // text-transform: uppercase; + @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); + background-color: darken(#F6EFD4, 5%); + background-position: center center; + background-repeat: no-repeat; + border-left: 1px solid darken(#f6efd4, 20%); + cursor: pointer; + display: table-cell; + padding: 14px 4px; + text-indent: -9999px; + width: 82px; + + &:hover { + text-decoration: none; + color: darken(#F6EFD4, 60%); + text-decoration: none; + background-color: none; + } + } + + &.prev { + background-image: url('/static/images/sequence-nav/previous-icon.png'); + + &:hover { + background-color: none; + } + } + + &.next { + background-image: url('/static/images/sequence-nav/next-icon.png'); + + &:hover { + background-color: none; + } + } + } + } +} diff --git a/sass/_courseware-video.scss b/sass/_courseware-video.scss index 389c23c370..45e7777399 100644 --- a/sass/_courseware-video.scss +++ b/sass/_courseware-video.scss @@ -62,19 +62,23 @@ section.course-content { background: #c2c2c2; border: none; border-bottom: 1px solid #000; - height: 20px; + height: 14px; a.ui-slider-handle { - @include border-radius(0); + @include border-radius(20px); + @include box-shadow(inset 0 1px 0 lighten($mit-red, 10%)); background: $mit-red url(/static/images/slider-handle.png) center center no-repeat; border: 0; - border-right: 1px solid darken($mit-red, 20%); - border-left: 1px solid darken($mit-red, 20%); + border: 1px solid darken($mit-red, 20%); cursor: pointer; height: 20px; - margin: 0; - top: 0; + margin-left: -10px; + top: -4px; width: 20px; + + &:focus { + outline: none; + } } } @@ -132,7 +136,9 @@ section.course-content { font-weight: bold; span { + @include inline-block(); cursor: pointer; + margin-bottom: 0; &:hover { color: $mit-red; @@ -146,7 +152,8 @@ section.course-content { ol.subtitles { float: left; width: flex-grid(3, 9); - min-height: 570px; + height: 530px; + overflow: hidden; li { margin-bottom: 0px; diff --git a/sass/_courseware.scss b/sass/_courseware.scss index b4ea8e3cbf..85fe533df2 100644 --- a/sass/_courseware.scss +++ b/sass/_courseware.scss @@ -78,146 +78,127 @@ div.course-wrapper { section.course-content { @extend .content; - ol.vert-mod { - > li { - @extend .clearfix; - border-bottom: 1px solid #eee; - padding: 15px 0; + p { + margin-bottom: lh(); - &:last-child { - border-bottom: none; - } - - h2 { - margin-top: 0; - margin-bottom: 15px; - } - - input[type="text"] { - display: inline-block; - margin: 8px 4px 4px 10px; - } + &:empty { + display: none; + margin-bottom: 0; } } - ol.sequence-nav { - margin-bottom: $body-line-height; - @extend .topbar; + .problem-set { + position: relative; + @extend .clearfix; - a { - @extend .block-link; + 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; + + @media screen and (max-width:1120px) { + display: block; + width: auto; + border-right: 0; + } } - li { - border: none; - cursor: pointer; + section.problem { display: table-cell; - padding: lh(.75); - float: left; + width: flex-grid(7, 9); + 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 { - background-color: lighten(#F6EFD4, 3%); - } + @media screen and (max-width:1120px) { + display: block; + width: auto; + padding: 0; } - &.seq_problem_visited { - width: 14px; - background: shade(#F6EFD4, 4%) url('/static/images/problem-icon.png') -57px 13px no-repeat; - &:hover { - background-color: #F6EFD4; + span { + &.unanswered, &.ui-icon-bullet { + @include inline-block(); + background: url('/static/images/unanswered-icon.png') center center no-repeat; + height: 14px; + position: relative; + top: 4px; + width: 14px; + } + + &.correct, &.ui-icon-check { + @include inline-block(); + background: url('/static/images/correct-icon.png') center center no-repeat; + height: 20px; + position: relative; + top: 6px; + width: 25px; + } + + &.incorrect, &.ui-icon-close { + @include inline-block(); + background: url('/static/images/incorrect-icon.png') center center no-repeat; + height: 20px; + width: 20px; + position: relative; + top: 6px; } } + } - &.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; - } + div { + > span { + display: block; + margin-bottom: lh(.5); } + } - //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%)); + input[type="text"] { + display: inline-block; + } - &:hover { - background-color: lighten(#F6EFD4, 3%); - } - } + center { + display: block; + margin: lh() 0; + border: 1px solid #ccc; + padding: lh(); + } - &.seq_video_visited { - width: 14px; - background: shade(#F6EFD4, 4%) url('/static/images/video-icon.png') -81px 15px no-repeat; - &:hover { - background-color: #F6EFD4; - } - } - - &.seq_video_active { - width: 14px; - background: #FFFBEB url('/static/images/video-icon.png') -32px 15px no-repeat; - @include box-shadow(inset -1px 0 0 darken(#F6EFD4, 20%),inset 1px 0 0 darken(#F6EFD4, 20%)); - &:hover { - background-color: #F6EFD4; - } - } + section.action { + margin-top: lh(); + } + } - //vertical - &.seq_vertical_inactive { - width: 14px; - background: url('/static/images/vertical-icon.png') -82px 15px no-repeat; - @include box-shadow(inset -1px 0 0 darken(#F6EFD4, 10%)); + section.problems-wrapper, div#seq_content { + @extend .problem-set; + } - &:hover { - background-color: lighten(#F6EFD4, 3%); - } - } + section.problems-wrapper { + display: table; + width: 100%; - &.seq_vertical_visited { - width: 14px; - background: shade(#F6EFD4, 4%) url('/static/images/vertical-icon.png') 13px 15px no-repeat; - &:hover { - background-color: #F6EFD4; - } - } + @media screen and (max-width:1120px) { + display: block; + width: auto; + } + } - &.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%)); + ol.vert-mod { + > li { + @extend .clearfix; + @extend .problem-set; + border-bottom: 1px solid #ddd; + margin-bottom: 15px; + padding: 0 0 15px; - &:hover { - background-color: #F6EFD4; - } - } - - &.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; - - &:hover { - text-decoration: none; - color: darken(#F6EFD4, 60%); - text-decoration: none; - background: none; - } + &:last-child { + border-bottom: none; + margin-bottom: 0; + padding-bottom: 0; } } } diff --git a/sass/_discussion-answers.scss b/sass/_discussion-answers.scss new file mode 100644 index 0000000000..12d6500c48 --- /dev/null +++ b/sass/_discussion-answers.scss @@ -0,0 +1,45 @@ +div.answer-controls { + @extend div.question-controls; + display: inline-block; + margin-top: 20px; + margin-bottom: 0; + + div.answer-sort { + @extend div.question-sort; + } + + div.answer-count { + @extend div.question-count; + } +} + +div.answer-block { + @extend div.question-header; + border-top: #ddd 1px solid; + display: inline-block; + float: left; + margin: 20px 0; + padding-top: 20px; + width: 100%; + + img.answer-img-accept { + margin: 10px 0px 10px 16px; + } + div.answer-container { + @extend div.question-container; + + div.answer-content { + @extend div.question-content; + + div.answer-body { + @extend div.question-body; + } + } + } + + div.meta-bar { + div.answer-actions { + @extend div.question-actions; + } + } +} diff --git a/sass/_discussion-questions.scss b/sass/_discussion-questions.scss index 8c7f04871a..4a8704c477 100644 --- a/sass/_discussion-questions.scss +++ b/sass/_discussion-questions.scss @@ -10,7 +10,7 @@ div.question-controls { div.question-count { margin-right: flex-gutter(); - width: flex-grid(5.5,9); + width: flex-grid(5,9); h1 { margin-top: 0; @@ -19,7 +19,7 @@ div.question-controls { div.question-sort { vertical-align: bottom; - width: flex-grid(3.5,9); + width: flex-grid(4,9); nav { @include border-radius(35px); @@ -28,10 +28,14 @@ div.question-controls { float: right; font-size: 16px; margin: 3px 0; - padding: 0 20px; + padding:0px 20px 5px; a { - color: darken(#F6EFD4, 50%); + color: darken(#F6EFD4, 50%); + + &.on span{ + font-weight: bold; + } &:before { content: '|'; @@ -153,42 +157,3 @@ div.search-tips { .search-result-summary { } - -div.post-update-info { - @include box-sizing(border-box); - @include border-radius(5px); - background:lighten(#F6EFD4, 5%); - padding: 10px; - - a { - color:$mit-red ; - } - - div.change-date { - font-size: 12px; - margin-bottom: 10px; - } - - div.avatar { - display: inline-block; - float: left; - margin-right: 3px; - - img.gravatar { - background: white; - border: 1px solid darken(#F6EFD4, 10%); - margin-right: 5px; - padding: 3px ; - vertical-align: bottom; - } - } - - div.user-meta { - display: inline-block; - width: 60%; - - span.user-badges { - display: block; - } - } -} diff --git a/sass/_help.scss b/sass/_help.scss index 3e65a78b53..2784b41c82 100644 --- a/sass/_help.scss +++ b/sass/_help.scss @@ -1,19 +1,54 @@ section.help.main-content { padding: lh(); + h1 { + margin-top: 0; + margin-bottom: lh(); + padding-bottom: lh(); + border-bottom: 1px solid #ddd; + } + p { max-width: 700px; } - dl { + h2 { + margin-top: 0; + } + + section.self-help { margin-bottom: lh(); + margin-right: flex-gutter(); + float: left; + width: flex-grid(6); - dd, dt { - margin-bottom: lh(.5); + ul { + margin-left: flex-gutter(6); + + li { + margin-bottom: lh(.5); + } } + } - dt { - font-weight: bold; + section.help-email { + float: left; + width: flex-grid(6); + + dl { + margin-bottom: lh(); + display: block; + + dd { + margin-bottom: lh(); + } + + dt { + font-weight: bold; + float: left; + clear: left; + width: flex-grid(2, 6); + } } } } diff --git a/sass/_index.scss b/sass/_index.scss index f1dd89392f..44c138d530 100644 --- a/sass/_index.scss +++ b/sass/_index.scss @@ -237,6 +237,40 @@ section.index-content { } } + &.intro { + section { + margin-bottom: 0; + + &.intro-text { + margin-right: flex-gutter(8); + width: flex-grid(4, 8); + + p { + margin-right: 0; + width: auto; + float: none; + } + } + + &.intro-video { + width: flex-grid(4, 8); + + a { + display: block; + width: 100%; + + img { + width: 100%; + } + + span { + display: none; + } + } + } + } + } + &.features { border-top: 1px solid #E5E5E5; padding-top: lh(); diff --git a/sass/_info.scss b/sass/_info.scss new file mode 100644 index 0000000000..687608d0a2 --- /dev/null +++ b/sass/_info.scss @@ -0,0 +1,43 @@ +div.info-wrapper { + @extend .table-wrapper; + + section.updates { + @extend .content; + } + + section.handouts { + @extend .sidebar; + @include border-radius(0px 4px 0px 4px); + border-right: 0; + border-left: 1px solid #d3d3d3; + + h1 { + padding: 0 lh(); + } + + ol { + list-style: none; + + li { + h2 { + padding: 0 lh(); + } + + a { + @include box-shadow(0 1px 0 #eee); + @include transition(); + border-bottom: 1px solid #d3d3d3; + color: lighten($text-color, 10%); + display: block; + padding: 7px lh(); + text-decoration: none; + + &:hover { + @include box-shadow(0 1px 0 #fff); + background: #efefef; + } + } + } + } + } +} diff --git a/sass/_layout.scss b/sass/_layout.scss index 2614e3b56c..6984531ff9 100644 --- a/sass/_layout.scss +++ b/sass/_layout.scss @@ -6,7 +6,7 @@ html { font: $body-font-size $body-font-family; text-align: center; margin: 0; - background: #f6f6f6; + background: #f4f4f4; //#f3f1e5 div.header-wrapper { // @include linear-gradient(lighten($mit-red, 5%), darken($mit-red, 5%)); @@ -20,17 +20,59 @@ html { @include box-sizing(border-box); padding: 0 $body-line-height; - h1 { - border-right: 1px solid darken($mit-red, 5%); - color: #000; - display: block; + hgroup { + @extend .clearfix; float: left; - font-size: 20px; - font-weight: 800; - margin: 0 lh() 0 0; - padding: 17px lh() 17px 0; - text-shadow: 0 1px 0 lighten($mit-red, 10%); - line-height: lh(); + + h1 { + border-right: 1px solid darken($mit-red, 5%); + color: darken($mit-red, 25%); + font-size: 20px; + font-weight: 800; + margin: 0 lh() 0 0; + padding: 17px lh() 14px 0; + text-shadow: 0 1px 0 lighten($mit-red, 10%); + line-height: lh(); + @include inline-block(); + } + + h2 { + @include inline-block(); + margin: 0 lh() 0 0; + padding: 19px lh() 9px 0; + line-height: lh(); + border-right: 1px solid darken($mit-red, 5%); + -webkit-font-smoothing: antialiased; + + a { + color: #fff; + text-decoration: none; + + &:hover { + color: rgba(#fff, .7); + } + } + } + + @media screen and (max-width: 920px) { + border-bottom: 1px solid darken($mit-red, 5%); + display: block; + float: none; + + h1 { + float: right; + border: 0; + margin-right: 0; + padding-right: 0; + } + + h2 { + float: left; + border: 0; + margin-right: 0; + padding-right: 0; + } + } } nav { @@ -41,27 +83,11 @@ html { text-shadow: 0 -1px 0 darken($mit-red, 10%); -webkit-font-smoothing: antialiased; - h2 { - float: left; - margin: 0 lh() 0 0; - padding: 19px lh() 12px 0; - line-height: lh(); - border-right: 1px solid darken($mit-red, 5%); - - a { - color: #fff; - - &:hover { - color: rgba(#fff, .7); - text-decoration: none; - } - } - } ul { @extend .clearfix; display: inline-block; - padding: 19px 0 12px; + padding: 19px 0 9px; margin: 0; li { @@ -72,6 +98,7 @@ html { a { color: #fff; + text-decoration: none; &:hover { color: rgba(#fff, .7); @@ -88,15 +115,17 @@ html { section.main-content { @extend .clearfix; @extend .wrapper; - @include box-shadow(0 0 4px #ddd); @include box-sizing(border-box); + @include border-radius(4px); + overflow: hidden; background: #fff; border-bottom: 1px solid #bbb; @media screen and (min-width: 1400px) { - margin-top: lh(.5); - @include border-radius(3px); - border: 1px solid #bbb; + // @include border-radius(3px); + @include box-shadow(0 0 4px #dfdfdf); + border: 1px solid #bbb; + margin-top: lh(.5); } } @@ -119,6 +148,14 @@ html { a { color: #444; + + &:link, &:visited { + color: #444; + } + + &:hover, &:focus { + color: #000; + } } } @@ -131,6 +168,14 @@ html { a { color: #444; + + &:link, &:visited { + color: #444; + } + + &:hover, &:focus { + color: #000; + } } } } diff --git a/sass/_leanmodal.scss b/sass/_leanmodal.scss index bdd1a9bb22..db8b0950f5 100644 --- a/sass/_leanmodal.scss +++ b/sass/_leanmodal.scss @@ -15,7 +15,6 @@ div.leanModal_box { @include box-sizing(border-box); display: none; border: none; - max-width: 600px; background: #fff; padding: lh(2); @@ -27,10 +26,45 @@ div.leanModal_box { margin-bottom: lh(); } + &#enroll { + max-width: 600px; + + ol { + @extend .clearfix; + + li { + + &.terms, &.honor-code { + width: auto; + float: none; + } + + div.tip { + display: none; + } + + &:hover { + div.tip { + display: block; + line-height: lh(); + position: absolute; + background: #333; + color: #fff; + width: 500px; + margin: 0 0 0 -10px; + padding: 10px; + -webkit-font-smoothing: antialiased; + font-size: 16px; + } + } + } + } + } + form { text-align: left; - div#enroll_error, div#login_error { + div#enroll_error, div#login_error, div#pwd_error { -webkit-font-smoothing: antialiased; background-color: #F50200; color: #fff; @@ -47,6 +81,7 @@ div.leanModal_box { ol { list-style: none; + margin-bottom: lh(); li { margin-bottom: lh(.5); diff --git a/sass/_profile.scss b/sass/_profile.scss index 9cab2dbce6..b383c61a85 100644 --- a/sass/_profile.scss +++ b/sass/_profile.scss @@ -1,28 +1,92 @@ div.profile-wrapper { @extend .table-wrapper; + color: #000; section.user-info { - @include box-sizing(border-box); - margin-right: flex-gutter(); - padding: $body-line-height; - width: flex-grid(6); - background: #e3e3e3; - border-right: 1px solid #d3d3d3; - text-shadow: 0 1px 0 #f6f6f6; - display: table-cell; + @extend .sidebar; + @include border-radius(0px 4px 0px 4px); + border-left: 1px solid #d3d3d3; + border-right: 0; + + h1 { + padding: lh(); + } + + ul { + list-style: none; + + li { + @include transition(); + color: lighten($text-color, 10%); + display: block; + text-decoration: none; + @include box-shadow(0 1px 0 #eee); + padding: 7px lh(); + border-bottom: 1px solid #d3d3d3; + + div#location_sub, div#language_sub { + font-weight: bold; + @include inline-block(); + + input { + margin: lh(.5) 0; + } + + &:empty { + padding: 0; + } + } + + div#description { + font-size: 12px; + } + } + } + + div#change_password_pop { + padding: 7px lh(); + color: #4D4D4D; + } } section.course-info { - @include box-sizing(border-box); - display: table-cell; - padding: $body-line-height; - width: flex-grid(6); + @extend .content; - ul { - li { - display: inline-block; - padding-right: 1em; + ol { + list-style: none; + + > li { + border-bottom: 1px solid #e3e3e3; + padding: lh() 0; + @extend .clearfix; + + h2 { + float: left; + padding: 0; + margin: 0; + width: flex-grid(2, 9); + margin-right: flex-gutter(9); + } + + div.scores { + float: left; + width: flex-grid(7, 9); + + h3 { + color: #666; + } + + ul { + list-style: none; + + li { + display: inline-block; + padding-right: 1em; + } + } + } } } + } } diff --git a/sass/_question-view.scss b/sass/_question-view.scss index 4f3cac582f..a9b51f516f 100644 --- a/sass/_question-view.scss +++ b/sass/_question-view.scss @@ -2,34 +2,40 @@ div.question-header { div.vote-buttons { display: inline-block; float: left; - width: flex-grid(1,9); margin-right: flex-gutter(9); + width: flex-grid(0.7,9); - ul li { - background-position: center; - background-repeat: no-repeat; - cursor: pointer; - font-weight: bold; - height: 20px; - list-style: none; - padding: 10px; - text-align: center; - width: 25px; + ul { + li { + background-position: center; + background-repeat: no-repeat; + cursor: pointer; + font-weight: bold; + height: 20px; + list-style: none; + padding: 10px; + text-align: center; + width: 70%; - &.question-img-upvote, &.answer-img-upvote { - background-image: url(/static/images/askbot/vote-arrow-up-new.png); - background-color: #F6EFD4; - - &:hover, &.on { - background-image: url(/static/images/askbot/vote-arrow-up-on-new.png); + &.post-vote { + @include border-radius(4px); + background-color: lighten(#F6EFD4, 3%); } - } - &.question-img-downvote, &.answer-img-downvote { - background-image: url(/static/images/askbot/vote-arrow-down-new.png); + &.question-img-upvote, &.answer-img-upvote { + background-image: url(/static/images/askbot/vote-arrow-up.png); - &:hover, &.on { - background-image: url(/static/images/askbot/vote-arrow-down-on-new.png); + &:hover, &.on { + background-color:#d1e3a8; + } + } + + &.question-img-downvote, &.answer-img-downvote { + background-image: url(/static/images/askbot/vote-arrow-down.png); + + &:hover, &.on { + background-color:#eac6ad; + } } } } @@ -38,7 +44,7 @@ div.question-header { div.question-container { display: inline-block; float: left; - width: flex-grid(8,9); + width: flex-grid(8.3,9); h1 { margin-top: 0; @@ -47,9 +53,9 @@ div.question-header { div.meta-bar { border-bottom: 1px solid #eee; display: block; - margin: 20px 0 10px; + margin: 10px 0; overflow: hidden; - padding-bottom: 15px; + padding: 5px 0 10px; div.tag-list { @@ -89,10 +95,195 @@ div.question-header { width: flex-grid(6.2,8); } - div.post-update-info { + div.post-update-container { display: inline-block; float: left; width: flex-grid(1.8,8); + + div.post-update-info { + @include box-sizing(border-box); + @include border-radius(5px); + background:lighten(#F6EFD4, 5%); + padding: 10px; + margin-bottom: 10px; + + &:last-child { + margin-bottom: 0; + } + + &.revision { + text-align: center; + background:lighten(#F6EFD4, 7%); + + a { + color: black; + } + } + + a { + color:$mit-red ; + } + + div.change-date { + font-size: 12px; + margin-bottom: 10px; + } + + div.avatar { + display: inline-block; + float: left; + margin-right: 3px; + + img.gravatar { + background: white; + border: 1px solid darken(#F6EFD4, 10%); + margin-right: 5px; + padding: 3px ; + vertical-align: bottom; + } + } + + div.user-meta { + display: inline-block; + width: 60%; + + span.user-badges { + display: block; + } + } + } + } + } + + div.comments-container { + @include box-sizing(border-box); + background: lighten(#efefef, 3%); + padding: 3%; + display: inline-block; + margin: 15px 0 0; + padding: 3%; + width: 100%; + + div.comments-content { + font-size: 13px; + + .block { + border-bottom: 1px solid #ddd; + border-top: 1px solid #fff; + padding: 15px 0; + display: block; + + &:first-child { + border-top: 0; + } + // &:only-of-type { + // border: 0; + // } + } + + form.post-comments { + } + + div.comment { + &:first-child { + border-top: 0; + } + + &:last-child { + margin-bottom: 20px; + } + + aside.comment-controls { + background: none; + border: none; + display: inline-block; + margin-top: -8px; + padding:0 2% 0 0; + text-align: center; + width: 5%; + + div { + background: none; + opacity: 0.6; + + &:hover { + opacity: 1; + } + } + + div.comment-votes { + @include transform(rotate(-90deg)); + width: 16px; + + a.upvote { + cursor: pointer; + font-size: 25px; + text-decoration: none; + color: green; + } + } + + hr { + margin: 0; + } + + div.comment-delete { + // display: inline; + color: $mit-red; + cursor: pointer; + font-size: 15px; + } + + div.comment-edit { + @include transform(rotate(50deg)); + cursor: pointer; + font-size: 16px; + a.edit-icon { + color: #555; + text-decoration: none; + } + } + } + + div.comment-body { + display: inline-block; + width: 95%; + + div.comment-meta { + text-align: right; + + a.author { + font-weight: bold; + } + + a.edit { + @extend .button; + font-size: 12px; + padding: 2px 10px; + // @include border-radius(2px); + // background: #eee; + // color: #555; + // cursor: pointer; + // padding: 1px 10px; + // text-decoration: none; + } + } + } + } + } + + #edit-comment-form { + margin: 10px 0; + min-height: 100px; + width: 99%; + resize: vertical; + } + .counter { + color: #888; + display: block; + float: right; + margin-top: 5px; + text-align: right; } } } diff --git a/sass/_textbook.scss b/sass/_textbook.scss index 2212367a02..2e8fe98cd7 100644 --- a/sass/_textbook.scss +++ b/sass/_textbook.scss @@ -20,6 +20,8 @@ div.book-wrapper { div.hitarea { margin-left: -22px; background-image: url('/static/images/treeview-default.gif'); + position: relative; + top: 4px; &:hover { opacity: 0.6; @@ -48,6 +50,7 @@ div.book-wrapper { a { @extend .block-link; + padding: 14px; } ul { @@ -74,10 +77,11 @@ div.book-wrapper { } section.page { + text-align: center; + img { border: 1px solid $border-color; max-width: 100%; - min-width: 100%; } } } diff --git a/sass/_theme.scss b/sass/_theme.scss index 276bb6a694..31e45ae734 100644 --- a/sass/_theme.scss +++ b/sass/_theme.scss @@ -37,14 +37,6 @@ h3 { clear:both; } -a:link, a:visited { - text-decoration:none; -} - -a:hover { - text-decoration:underline; -} - #wrapper { background: transparent url( images/css/page-vbg.jpg ) repeat-y scroll 50% 0px; margin:0 auto ; diff --git a/sass/_wiki.scss b/sass/_wiki.scss index a3c6c95e3c..86b90c43d6 100644 --- a/sass/_wiki.scss +++ b/sass/_wiki.scss @@ -78,6 +78,10 @@ div.wiki-wrapper { header { @extend .topbar; + &:empty { + display: none !important; + } + a { @extend .block-link; } @@ -110,7 +114,7 @@ div.wiki-wrapper { font-size: 12px; text-transform: uppercase; letter-spacing: 1px; - padding: lh(.75); + padding: 14px; margin: 0; &:hover { diff --git a/sass/application.scss b/sass/application.scss index 6d046c2a6a..7e1bbf3ce5 100644 --- a/sass/application.scss +++ b/sass/application.scss @@ -8,14 +8,15 @@ @import "leanmodal"; // pages -@import "courseware", "courseware-video"; +@import "courseware", "courseware-video", "courseware-sequence-nav"; @import "textbook"; +@import "info"; @import "profile"; @import "wiki-basic-html", "wiki-create", "wiki"; @import "activation"; @import "help"; -@import "askbot-original", "discussion", "discussion-questions", "discussion-tags", "question-view" ; +@import "askbot-original", "discussion", "discussion-questions", "discussion-tags", "question-view" , "discussion-answers"; // left over -@import "theme"; -@import "local"; +// @import "theme"; +// @import "local"; diff --git a/schematic_tutorial.html b/schematic_tutorial.html new file mode 120000 index 0000000000..da681ac006 --- /dev/null +++ b/schematic_tutorial.html @@ -0,0 +1 @@ +../data/problems/schematic_tutorial.html \ No newline at end of file diff --git a/schematicinput.html b/schematicinput.html index 8c7f7e0c83..f79dc66d24 100644 --- a/schematicinput.html +++ b/schematicinput.html @@ -1,19 +1,25 @@ - - - - - -% if state == 'unsubmitted': + + + + + + + + + + % if state == 'unsubmitted': -% elif state == 'correct': + % elif state == 'correct': -% elif state == 'incorrect': + % elif state == 'incorrect': -% elif state == 'incomplete': + % elif state == 'incomplete': -% endif + % endif + diff --git a/seq_module.html b/seq_module.html index 6608344e2f..3f28739a55 100644 --- a/seq_module.html +++ b/seq_module.html @@ -1,12 +1,15 @@ -
    +
+ + diff --git a/simplewiki_base.html b/simplewiki_base.html index f73c63218e..731f5be8d9 100644 --- a/simplewiki_base.html +++ b/simplewiki_base.html @@ -73,7 +73,7 @@ <%block name="wiki_head"/> -<%include file="navigation.html" /> +<%include file="navigation.html" args="active_page='wiki'" />
diff --git a/staticbook.html b/staticbook.html index 46348a1441..a9afbede22 100644 --- a/staticbook.html +++ b/staticbook.html @@ -34,7 +34,7 @@ function next_page() { } -<%include file="navigation.html" /> +<%include file="navigation.html" args="active_page='book'" />
diff --git a/textinput.html b/textinput.html index fbe9090df8..1473eadbf2 100644 --- a/textinput.html +++ b/textinput.html @@ -1,13 +1,15 @@ - - - -% if state == 'unsubmitted': - -% elif state == 'correct': - -% elif state == 'incorrect': - -% elif state == 'incomplete': - -% endif - +
+ + + + + % if state == 'unsubmitted': + + % elif state == 'correct': + + % elif state == 'incorrect': + + % elif state == 'incomplete': + + % endif +
diff --git a/tos.html b/tos.html index 9a4d327e87..769102c026 100644 --- a/tos.html +++ b/tos.html @@ -3,13 +3,13 @@
-

MITx Terms of Service

+

MITx Terms of Service

-

Welcome to MITx. You must read and agree to these Terms of Service -("TOS"), MITx’s Privacy +

Welcome to MITx. You must read and agree to these Terms of Service +("TOS"), MITx’s Privacy Policy, and Honor Code prior to registering for this Site or using any portion of this site -(“Site”) , including accessing any course materials, chat +(“Site”), including accessing any course materials, chat room, mailing list, or other electronic service. These TOS, the Privacy Policy and the Honor Code are agreements (the “Agreements”) between you and the Massachusetts Institute @@ -17,7 +17,7 @@ of Technology (“MIT”). If you do not understand or do not agree to be bound by the terms of the Agreements, please immediately exit this site.

-

MITx reserves the right to modify these TOS at any time and will +

MITx reserves the right to modify these TOS at any time and will publish notice of any such modifications online on the Site Terms of Service page for a reasonable period of time following such modifications, and by changing the @@ -25,13 +25,12 @@ effective date of these TOS. By continuing to access the Site after notice of such modifications has been published, you signify your agreement to be bound by them.

-

Description of MITx

+

Description of MITx

-

MITx offers online courses, professor-to-student and -student-to-student interactivity, individual assessment of a -student’s work, and the opportunity for students who demonstrate -their mastery of subjects to earn a certificate or credential awarded -by MITx.

+

MITx offers online courses that include opportunities for +professor-to-student and student-to-student interactivity, individual +assessment of a student's work, and for students who demonstrate their +mastery of subjects, a certificate or credential.

Rules for Online Conduct

@@ -39,32 +38,34 @@ by MITx.

for your User Postings. “User Postings” include all content submitted, posted, published or distributed on the Site by you or other users of the Site, including but not limited to all forum -posts, notes, questions, and comments. You agree that you will use the -Site in compliance with these TOS and all applicable local, state, -national, and international laws, rules and regulations, including any -laws regarding the transmission of technical data exported from your -country of residence and all United States export control laws. +posts, wiki edits, notes, questions, comments, videos, and file +uploads. You agree that you will use the Site in compliance with these +TOS, the Honor Code, and all applicable +local, state, national, and international laws, rules and regulations, +including copyright laws and any laws regarding the transmission of +technical data exported from your country of residence and all United +States export control laws.

As a condition of your use of the Services, you will not use the -Site in any manner that could damage, disable, overburden, or impair -any MITx server, or the network(s) connected to any MITx server, or -interfere with any other party's use and enjoyment of the +Site in any manner intended to damage, disable, overburden, or impair +any MITx server, or the network(s) connected to any MITx +server, or interfere with any other party's use and enjoyment of the Site. You may not attempt to gain unauthorized access to the Site, -other accounts, computer systems or networks connected to any MITx -server through hacking, password mining or any other means. You may -not obtain or attempt to obtain any materials or information through -any means not intentionally made available through the Site.

+other accounts, computer systems or networks connected to +any MITx server through hacking, password mining or any other +means. You may not obtain or attempt to obtain any materials or +information stored on the Site, its servers, or associated computers +through any means not intentionally made available through the +Site.

The following list of items is strictly prohibited on the Site:

    -
  1. Content that defames or threatens others -
  2. Harassing statements or content +
  3. Content that defames, harasses, or threatens others
  4. Content that discusses illegal activities with the intent to commit them.
  5. Content that infringes another's intellectual property, -including, but not limited to, copyrights, trademarks, or trade -secrets -
  6. Any inappropriate, profane, pornographic, defamatory, obscene, -indecent, or unlawful content +including, but not limited to, copyrights, or trademarks +
  7. Any inappropriate, profane, pornographic, obscene, indecent, or +unlawful content
  8. Advertising or any form of commercial solicitation
  9. Political content or content related to partisan political activities @@ -100,7 +101,7 @@ information to keep it accurate and current.

    We consider the confidentiality and security of your information to be of the utmost importance. Please see our Privacy Policy for more information -about what information about you MITx collects and how MITx uses that +about what information about you MITx collects and how MITx uses that information.

    Your Right to Use Content on the Site

    @@ -109,7 +110,7 @@ information.

    Site is protected by United States copyright. The texts, exams and other instructional materials provided with the courses offered on this Site are for your personal use in connection with those courses -only. MIT is planning to make MITx course content and software +only. MIT is planning to make MITx course content and software infrastructure available under open source licenses that will help create a vibrant ecosystem of contributors and further MIT’s goal of making education accessible and affordable to the world.

    @@ -118,40 +119,41 @@ goal of making education accessible and affordable to the world.

    information on the Site are used with the permission of third parties and use of that information is subject to certain rules and conditions, which will be posted along with the information. By using -this Site you agree to abide by all such terms and conditions. Due to -privacy concerns, student-created content, including all forum posts, -is all Rights Reserved until released under other terms by MITx.

    +this Site you agree to abide by all such rules and conditions. Due to +privacy concerns, User Postings shall be licensed to MITx with +the terms discussed below.

    -

    USER POSTINGS

    +

    User Postings

    User Postings Representations and Warranties. By -uploading and publishing your User Postings, you affirm, represent, -and warrant that you are the creator and owner of or have the -necessary licenses, rights, consents, and permissions to use and to -authorize MIT and MITx’s Users to use and distribute your User -Postings as necessary to exercise the licenses granted by you in these -TOS and in the manner contemplated by MITx. You, and not MITx, are -solely responsible for your User Postings and the consequences of -posting or publishing them.

    +creating your User Postings, you affirm, represent, and warrant that +you are the creator and owner of or have the necessary licenses, +rights, consents, and permissions to reproduce and publish the posted +information, and to authorize MIT and MITx's Users to +reproduce, modify, publish, and otherwise use that infomation and +distribute your User Postings as necessary to exercise the licenses +granted by you below. You, and not MITx, are solely responsible +for your User Postings and the consequences of posting or publishing +them.

    -

    Limited License Grant to MIT. By submitting or distributing -User Postings through the Site, you hereby grant to MIT a worldwide, -non-exclusive, transferable, assignable, fully paid-up, royalty-free, -perpetual, irrevocable right and license to host, transfer, display, -perform, reproduce, modify, distribute and re-distribute, relicense, -and otherwise exploit your User Postings, in whole or in part, in any -form, and in any media formats and through any media channels (now -known or hereafter developed).

    +

    Limited License Grant to MIT. By submitting or +distributing User Postings to the Site, you hereby grant to MIT a +worldwide, non-exclusive, transferable, assignable, fully paid-up, +royalty-free, perpetual, irrevocable right and license to host, +transfer, display, perform, reproduce, modify, distribute and +re-distribute, relicense, and otherwise exploit your User Postings, in +whole or in part, in any form, and in any media formats and through +any media channels (now known or hereafter developed).

    -

    Limited License Grant to MITx Users. By submitting -or distributing User Postings through the Site, you hereby grant to -each User of the Site a non-exclusive license to access and use your -User Postings in connection with their use of the Site for their own -personal purposes.

    +

    Limited License Grant to MITx Users. By +submitting or distributing User Postings to the Site, you hereby grant +to each User of the Site a non-exclusive license to access and use +your User Postings in connection with their use of the Site for their +own personal purposes.

    -

    Use of MITx and MIT Names, Trademarks and Service Marks

    +

    Use of MITx and MIT Names, Trademarks and Service Marks

    -

    “MITx,” "MIT", "Massachusetts Institute +

    “MITx,” "MIT", "Massachusetts Institute of Technology", and its logos and seal are trademarks of the Massachusetts Institute of Technology. You may not use MIT’s names or logos, or any variations thereof, without prior written @@ -181,16 +183,13 @@ incorporated herein by reference.

    Disclaimer of Warranty / Indemnification/Limitation of Liabilities

    -

    THE SITE, INCLUDING, WITHOUT LIMITATION, ALL SERVICES, CONTENT, -FUNCTIONS AND MATERIALS PROVIDED ON OR THROUGH THE SITE AND ANY -INFORMATION THEREIN ARE PROVIDED "AS IS" WITHOUT WARRANTY OF -ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION, THE -IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR USE FOR A -PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT AND MIT HEREBY DISCLAIMS -ANY AND ALL SUCH WARRANTIES, EXPRESS OR IMPLIED. MIT does not warrant -the Site will operate in an uninterrupted or error-free manner or that -the Site is free of viruses or other harmful components. Use of -information obtained from or through this Site is at your own +

    THE SITE IS PROVIDED "AS IS" AND "AS AVAILABLE" +WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING +WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS +FOR USE FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. MIT does not +warrant the Site will operate in an uninterrupted or error-free manner +or that the Site is free of viruses or other harmful components. Use +of information obtained from or through this Site is at your own risk. Your access to or download of information, materials, or data through the Site or any reference sites is at your own discretion and risk and that you will be solely responsible for any damage to your @@ -207,8 +206,8 @@ indecent or objectionable, and you agree to waive, and hereby do waive, any legal or equitable rights or remedies you have or may have against MIT with respect thereto. MIT does not endorse any User Postings or any opinion, recommendation or advice expressed -therein. MITx has no obligation to monitor any User Postings or -any other user communications through the Site. However, MITx reserves +therein. MITx has no obligation to monitor any User Postings or +any other user communications through the Site. However, MITx reserves the right to review User Postings and to edit or remove, in whole or in part, such User Postings in its sole discretion. If notified by a User or a content owner of a User Posting that allegedly does not @@ -220,23 +219,18 @@ reserves the right to do at any time and without notice.

    hyperlinks to sites maintained or controlled by others. MIT is not responsible for and does not routinely screen, approve, review or endorse the contents of or use of any of the products or services that -may be offered at these sites. MIT does MIT make any warranty or -representation regarding any linked third party web sites or the -information or materials appearing thereon or any of the products or -services described thereon. Hyperlinks do not imply that MIT is -affiliated or associated with, the linked-third party site. If -you decide to access linked third party web sites, you do so at your -own risk.

    +may be offered at these sites. If you decide to access linked third +party web sites, you do so at your own risk.

    YOU AGREE THAT MIT WILL NOT BE LIABLE TO YOU FOR ANY LOSS OR DAMAGES, EITHER ACTUAL OR CONSEQUENTIAL, ARISING OUT OF OR RELATING TO -THESETOS, OR TO YOUR (OR ANY THIRD PARTY'S) USE OR INABILITY TO -USE THE SITE, OR TO YOUR PLACEMENT OF CONTENT ON THE SITE, OR TO YOUR -RELIANCE UPON INFORMATION OBTAINED FROM OR THROUGH THE SITE WHETHER -BASED IN CONTRACT, TORT, STATUTORY OR OTHER LAW, EXCEPT ONLY IN THE -CASE OF DEATH OR PERSONAL INJURY WHERE AND ONLY TO THE EXTENT THAT -APPLICABLE LAW REQUIRES SUCH LIABILITY.

    +THESE TERMS OF SERVICE, OR TO YOUR (OR ANY THIRD PARTY'S) USE OR +INABILITY TO USE THE SITE, OR TO YOUR PLACEMENT OF CONTENT ON THE +SITE, OR TO YOUR RELIANCE UPON INFORMATION OBTAINED FROM OR THROUGH +THE SITE WHETHER BASED IN CONTRACT, TORT, STATUTORY OR OTHER LAW, +EXCEPT ONLY IN THE CASE OF DEATH OR PERSONAL INJURY WHERE AND ONLY TO +THE EXTENT THAT APPLICABLE LAW REQUIRES SUCH LIABILITY.

    IN PARTICULAR, MIT WILL HAVE NO LIABILTY FOR ANY CONSEQUENTIAL, INDIRECT, PUNITIVE, SPECIAL, EXEMPLARY OR INCIDENTAL DAMAGES, WHETHER diff --git a/video.html b/video.html index 7e13c80974..f6106fd671 100644 --- a/video.html +++ b/video.html @@ -1,3 +1,6 @@ +% if name != None: +

    ${name}

    +% endif
    @@ -27,7 +30,7 @@
      -
      2. +
      5. @@ -42,5 +45,5 @@
      8. -
      9. +
    diff --git a/video_init.js b/video_init.js index c4bb25f41e..bf1b4bf5b7 100644 --- a/video_init.js +++ b/video_init.js @@ -10,14 +10,13 @@ if (swfobject.hasFlashPlayerVersion("10.1")){ } else { //end of this URL may need &origin=http://..... once pushed to production to prevent XSS - $("#html5_player").attr("src", "http://www.youtube.com/embed/" + streams["1.0"] + "?enablejsapi=1&controls=0"); + $("#html5_player").attr("src", document.location.protocol + "//www.youtube.com/embed/" + streams["1.0"] + "?enablejsapi=1&controls=0"); $("#html5_player").show(); var tag = document.createElement('script'); tag.src = "http://www.youtube.com/player_api"; var firstScriptTag = document.getElementsByTagName('script')[0]; firstScriptTag.parentNode.insertBefore(tag, firstScriptTag); - // Make sure the callback is called once API ready, YT seems to be buggy loadHTML5Video(); }