diff --git a/6002x-faq.html b/6002x-faq.html index 475e0312c8..73e04e8a7e 100644 --- a/6002x-faq.html +++ b/6002x-faq.html @@ -26,13 +26,32 @@ someone else already signed up with that username. Try a different, more unique username. For example, try adding a random number to the end.

+

I forgot my password

+ +

The log-in form will have a link to reset your password once the +course opens.

+ +

The videos stall out

+ +

You should confirm your internet connection is fast enough to stream +videos, and that Youtube is not blocked by your internet +provider. Since the videos are hosted by YouTube, we have no control +over most technical problems with video playback (aside from those +related specifically to our player).

+ +

You should also confirm you have a current version of Flash installed. +While our player supports YouTube's HTML5 API (which allows playback without +Flash), this support is experimental.

+ +

I am interested in a different subject. What other courses do you offer?

6.002x is the pilot course for MITx. While we plan to offer a range of courses in the future, at present, 6.002x is the only course -available.

+available. Specific future offerings will be announced later.

+

How will I know that the course has started?

The course will start on March 5. Check the website @@ -41,17 +60,23 @@ the course website 6.002x.mitx.mit.edu on or slightly before March 5 so you can login, begin to get familiar with the site and start the course.

-

Why is there no log-in button?

+ +

I can't log in

You will not be able to log into the course until either the -starting date, or shortly before.

+starting date, or shortly before. If you have problems logging in once +the course has started, please verify that you are using the latest +version of either Firefox or Google Chrome, and have JavaScript and +cookies enabled.

+

Does the class have a schedule?

The lectures are on-line videos, and may be watched at your own pace and schedule. The course will have fixed deadlines for homework assignments and exams.

+

I just enrolled for the course. I have not received any form of acknowledgement that I have enrolled.

@@ -59,7 +84,8 @@ of acknowledgement that I have enrolled. most common issues are: + + + % if settings.COURSEWARE_ENABLED: @@ -128,7 +134,7 @@ $(document).ready(function(){ submit_data, function(json) { if(json.success) { - location.href="/courseware"; + location.href="/info"; } else if($('#login_error').length == 0) { $('#login_form').prepend('
Email or password is incorrect.
'); } else { @@ -156,7 +162,20 @@ $(document).ready(function(){ }); }); + +$(function(){ + $("a[rel*=leanModal]").leanModal(); + + $("a.login").click(function(){ + $("#login_form #li_email").focus(); + }); + + $("a.enroll").click(function(){ + $("#enroll_form #ca_email").focus(); + }); + }); +<%block name="js_extra"/> diff --git a/mitx_global.html b/mitx_global.html index 9c4e6402c7..2f57a2efa1 100644 --- a/mitx_global.html +++ b/mitx_global.html @@ -51,6 +51,8 @@ + +<%block name="js_extra"> + diff --git a/mitx_help.html b/mitx_help.html index a9ec20eb44..64c22cfff4 100644 --- a/mitx_help.html +++ b/mitx_help.html @@ -11,7 +11,7 @@ reach us at:

System-related questions
-
technical@mitx.mit.edu
+
technical@mitx.mit.edu -- For technical questions, please make sure you are using a current version of Firefox or Chrome, and include browser and version in your e-mail, as well as screenshots or other pertinent details.
Content-related questions
content@mitx.mit.edu
Bug reports
diff --git a/navigation.html b/navigation.html index bba364d18b..345e6eaa3c 100644 --- a/navigation.html +++ b/navigation.html @@ -11,8 +11,8 @@
  • Courseware
  • Course Info
  • Textbook
    • -
  • Discussion
    • -
  • Wiki
    • +
  • Discussion
    • +
  • Wiki
  • Profile
    • diff --git a/profile.html b/profile.html index 1b6b2c8fc0..a126ad1fe9 100644 --- a/profile.html +++ b/profile.html @@ -89,7 +89,7 @@ $(function() {

    Course Progress

    -
    +
      %for chapter in chapters: @@ -108,7 +108,7 @@ $(function() { %>

      - ${ section['section'] } ${"({0}/{1}) {2}".format( earned, total, percentageString )}

      + ${ section['section'] } ${"({0:g}/{1:g}) {2}".format( earned, total, percentageString )} ${section['subtitle']} %if 'due' in section and section['due']!="": due ${section['due']} @@ -118,7 +118,7 @@ $(function() {
        ${ "Problem Scores: " if section['graded'] else "Practice Scores: "} %for score in section['scores']: -
      1. ${ score[0] }/${ score[1] }
        2. +
      2. ${"{0:g}/{1:g}".format(score[0],score[1])}
        3. %endfor
      %endif diff --git a/profile_graphs.js b/profile_graphs.js index 502c3c1469..dbe5dc1f96 100644 --- a/profile_graphs.js +++ b/profile_graphs.js @@ -9,15 +9,18 @@ $(function () { display: 'none', top: y + 5, left: x + 5, - border: '1px solid #fdd', - padding: '2px', - 'background-color': '#fee', + border: '1px solid #000', + padding: '4px 6px', + color: '#fff', + 'background-color': '#333', opacity: 0.90 }).appendTo("body").fadeIn(200); } /* -------------------------------- Grade detail bars -------------------------------- */ - var colors = [$.color.parse("#E8B800"), $.color.parse("#A0CEFA"), $.color.parse("#BD3738"), $.color.parse("#429A2E")]; + var colors = [ $.color.parse("#b72121"), $.color.parse("#600101"), $.color.parse("#666666"), $.color.parse("#333333")]; + // var colors = [ $.color.parse("#2e80ce"), $.color.parse("#14518b"), $.color.parse("#599535"), $.color.parse("#3d731c")]; + // var colors = [ $.color.parse("#3f80be"), $.color.parse("#128251"), $.color.parse("#e1b900"), $.color.parse("#d10404")]; //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")]; @@ -58,7 +61,7 @@ $(function () { color: colors[${sectionIndex}].toString(), }); ticks = ticks.concat( [ [${tickIndex}, "${section['totallabel']}"] ] ); - detail_tooltips["${section['category']} Average"] = [ "${section['totalscore']['summary']}" ]; + 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 @@ -76,7 +79,7 @@ $(function () { %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"} ); + series.push( {label: 'Dropped Scores', data: droppedScores, points: {symbol: "cross", show: true, radius: 3}, bars: {show: false}, color: "#333"} ); /* ----------------------------- Grade overviewew bar -------------------------*/ @@ -113,12 +116,12 @@ $(function () { var options = { series: {stack: true, lines: {show: false, steps: false }, - bars: {show: true, barWidth: 0.6, align: 'center', lineWidth: 1},}, + bars: {show: true, barWidth: 0.8, align: 'center', lineWidth: 0, fill: .8 },}, xaxis: {tickLength: 0, min: 0.0, max: ${tickIndex - sectionSpacer}, ticks: ticks, labelAngle: 90}, 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"}, ] }, + markings: [ {yaxis: {from: 0.87, to: 1 }, color: "#ddd"}, {yaxis: {from: 0.7, to: 0.87 }, color: "#e9e9e9"}, + {yaxis: {from: 0.6, to: 0.7 }, color: "#f3f3f3"}, ] }, legend: {show: false}, }; diff --git a/sass/_info.scss b/sass/_info.scss index 9f0762cd59..418cc1a00a 100644 --- a/sass/_info.scss +++ b/sass/_info.scss @@ -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; + } + } } } } @@ -43,8 +49,10 @@ div.info-wrapper { border-left: 1px solid #d3d3d3; h1 { - padding: 0 lh(); + padding: lh(.5) lh(); font-size: 18px; + margin: 0 ; + @extend .bottom-border; } ol { diff --git a/sass/_profile.scss b/sass/_profile.scss index 8a08759294..f696116ab8 100644 --- a/sass/_profile.scss +++ b/sass/_profile.scss @@ -4,13 +4,15 @@ div.profile-wrapper { section.user-info { @extend .sidebar; - @include border-radius(0px 4px 0px 4px); + @include border-radius(0px 4px 4px 0); border-left: 1px solid #d3d3d3; border-right: 0; h1 { - padding:0 lh(); + padding: lh(.5) lh(); font-size: 18px; + margin: 0 ; + @extend .bottom-border; } ul { @@ -57,32 +59,41 @@ div.profile-wrapper { @extend .top-header; } + div#grade-detail-graph { + width: 100%; + min-height: 300px; + } + > ol { - list-style: none; border-top: 1px solid #e3e3e3; + list-style: none; margin-top: lh(); > li { + @extend .clearfix; border-bottom: 1px solid #e3e3e3; + display: table; padding: lh() 0; width: 100%; - display: table; - @extend .clearfix; + + &:last-child { + border-bottom: 0px; + } h2 { - display: table-cell; - padding: 0; - margin: 0; - 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; + margin: 0; + padding: 0; + padding-right: flex-gutter(9); + width: flex-grid(2, 9); } ol.sections { - padding-left: flex-gutter(9); display: table-cell; list-style: none; + padding-left: flex-gutter(9); width: flex-grid(7, 9); > li { @@ -112,6 +123,5 @@ div.profile-wrapper { } } } - } } diff --git a/sass/_textbook.scss b/sass/_textbook.scss index ea49f20d96..f0e43cd523 100644 --- a/sass/_textbook.scss +++ b/sass/_textbook.scss @@ -1,43 +1,47 @@ div.book-wrapper { @extend .table-wrapper; - ul#booknav { + section.book-sidebar { @extend .sidebar; @include box-sizing(border-box); + @extend .tran; - a { - color: #000; + ul#booknav { - &:hover { - color: #666; - } - } - - li { - background: none; - padding-left: 30px; - - div.hitarea { - margin-left: -22px; - background-image: url('/static/images/treeview-default.gif'); - position: relative; - top: 4px; + a { + color: #000; &:hover { - opacity: 0.6; - filter: alpha(opacity=60); + color: #666; } } - ul { + li { background: none; - } - } + padding-left: 30px; - > li { - border-bottom: 1px solid #d3d3d3; - @include box-shadow(0 1px 0 #eee); - padding: 7px 7px 7px 30px; + div.hitarea { + margin-left: -22px; + background-image: url('/static/images/treeview-default.gif'); + position: relative; + top: 4px; + + &:hover { + opacity: 0.6; + filter: alpha(opacity=60); + } + } + + ul { + background: none; + } + } + + > li { + border-bottom: 1px solid #d3d3d3; + @include box-shadow(0 1px 0 #eee); + padding: 7px 7px 7px 30px; + } } } @@ -50,7 +54,7 @@ div.book-wrapper { a { @extend .block-link; - padding: 14px; + padding: 0 lh(); } ul { @@ -92,4 +96,36 @@ div.book-wrapper { } } } + + &.closed { + section.book-sidebar { + width: flex-grid(.6); + + header#open_close_accordion { + padding: 0; + + a { + background-image: url('/static/images/slide-right-icon.png'); + } + + h2 { + visibility: hidden; + width: 10px; + padding: 0; + } + } + + ul#booknav { + visibility: hidden; + width: 10px; + padding: 0; + overflow: hidden; + max-height: 100px; + } + } + + section.course-content { + width: flex-grid(11.5) + flex-gutter(); + } + } } diff --git a/sass/application.scss b/sass/application.scss index 2cf4f46a91..d4b2d01a84 100644 --- a/sass/application.scss +++ b/sass/application.scss @@ -4,14 +4,14 @@ @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"; +@import "courseware/courseware", "courseware/sidebar", "courseware/video", "courseware/sequence-nav", "courseware/amplifier"; @import "textbook"; @import "info"; @import "profile"; -@import "wiki/basic-html", "wiki/sidebar", "wiki/create", "wiki/wiki"; +@import "wiki/basic-html", "wiki/sidebar", "wiki/create", "wiki/wiki", "wiki/table"; @import "help"; -@import "discussion/askbot-original", "discussion/discussion","discussion/sidebar", "discussion/questions", "discussion/tags", "discussion/question-view" , "discussion/answers", "discussion/forms", "discussion/form-wmd-toolbar", "discussion/modals", "discussion/profile"; +@import "discussion/askbot-original", "discussion/discussion","discussion/sidebar", "discussion/questions", "discussion/tags", "discussion/question-view" , "discussion/answers", "discussion/forms", "discussion/form-wmd-toolbar", "discussion/modals", "discussion/profile", "discussion/badges"; diff --git a/sass/base/_extends.scss b/sass/base/_extends.scss index c482b947e6..d55fe62f96 100644 --- a/sass/base/_extends.scss +++ b/sass/base/_extends.scss @@ -10,8 +10,8 @@ margin: 0 auto; max-width: $fg-max-width; min-width: $fg-min-width; - width: flex-grid(12); text-align: left; + width: flex-grid(12); div.table-wrapper { display: table; @@ -20,24 +20,24 @@ } h1.top-header { - margin: (-(lh())) (-(lh())) lh(); - padding: lh(); background: #f3f3f3; border-bottom: 1px solid #e3e3e3; + margin: (-(lh())) (-(lh())) lh(); + padding: lh(); } .button { - @include box-shadow(inset 0 1px 0 lighten(#888, 10%), 0 0 3px #ccc); - @include linear-gradient(lighten(#888, 5%), darken(#888, 5%)); - @include border-radius(3px); border: 1px solid darken(#888, 10%); - padding: 4px 8px; + @include border-radius(3px); + @include box-shadow(inset 0 1px 0 lighten(#888, 10%), 0 0 3px #ccc); color: #fff; - font: bold $body-font-size $body-font-family; cursor: pointer; - -webkit-font-smoothing: antialiased; - text-shadow: none; + font: bold $body-font-size $body-font-family; + @include linear-gradient(lighten(#888, 5%), darken(#888, 5%)); + padding: 4px 8px; text-decoration: none; + text-shadow: none; + -webkit-font-smoothing: antialiased; &:hover, &:focus { @include box-shadow(inset 0 1px 0 lighten(#888, 20%), 0 0 3px #ccc); @@ -47,48 +47,68 @@ h1.top-header { } .content { - @include box-sizing(border-box); @include box-shadow(inset 0 0 2px 3px #f3f3f3); + @include box-sizing(border-box); display: table-cell; padding: lh(); vertical-align: top; width: flex-grid(9) + flex-gutter(); + + @media print { + @include box-shadow(none); + } } .sidebar { + background: #e3e3e3; + @include border-radius(4px 0 0 4px); + border-right: 1px solid #d3d3d3; @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; font-family: $body-font-family; + position: relative; text-shadow: 0 1px 0 #f1f1f1; vertical-align: top; width: flex-grid(3); - position: relative; + + h1, h2 { + font-size: 18px; + font-weight: 800; + letter-spacing: 0; + text-transform: none; + } + + .bottom-border { + @include box-shadow(0 1px 0 #eee); + border-bottom: 1px solid #d3d3d3; + } + + @media print { + display: none; + } h3 { - @include box-shadow(0 1px 0 #eee); - background: none; border: none; border-bottom: 1px solid #d3d3d3; + @extend .bottom-border; + background: none; color: #000; font-weight: normal; margin: 0; overflow: hidden; a { - @include transition(); color: lighten($text-color, 10%); display: block; font-size: $body-font-size; padding: 7px 7px 7px 30px; text-decoration: none; + @include transition(); &:hover { - @include box-shadow(0 1px 0 #fff); background: #efefef; + @include box-shadow(0 1px 0 #fff); } } @@ -97,10 +117,10 @@ h1.top-header { } &.active { - @include box-shadow(none); background: none; border: 0; border-bottom: 1px solid #bbb; + @include box-shadow(none); color: #000; font-weight: bold; @@ -110,19 +130,54 @@ h1.top-header { } } + header#open_close_accordion { + border-bottom: 1px solid #d3d3d3; + @include box-shadow(0 1px 0 #eee); + padding: lh(.5) lh(); + position: relative; + + h2 { + padding-right: 20px; + margin: 0; + } + + a { + background: #eee url('/static/images/slide-left-icon.png') center center no-repeat; + border: 1px solid #D3D3D3; + @include border-radius(3px 0 0 3px); + height: 16px; + padding: 8px; + position: absolute; + right: -1px; + text-indent: -9999px; + top: 6px; + width: 16px; + + &:hover { + background-color: white; + } + } + } + a.button { text-decoration: none; } } .topbar { + @extend .clearfix; background: #F6EFD4; border-bottom: 1px solid darken(#F6EFD4, 10%); - 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; + font-size: 12px; + margin: (-$body-line-height) (-$body-line-height) $body-line-height; + text-shadow: 0 1px 0 #fff; + line-height: 46px; + height:46px; + + @media print { + display: none; + } a { color: darken(#F6EFD4, 80%); @@ -133,12 +188,11 @@ h1.top-header { } &.block-link { - @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); background: darken(#F6EFD4, 5%); border-left: 1px solid darken(#f6efd4, 20%); - padding: lh(.75); - text-transform: uppercase; + @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); display: block; + text-transform: uppercase; &:hover { background: none; @@ -146,3 +200,16 @@ h1.top-header { } } } + +.tran { + @include transition( all, .2s, $ease-in-out-quad); +} + +p.ie-warning { + display: block !important; + line-height: 1.3em; + background: yellow; + padding: lh(); + text-align: left; + margin-bottom: 0; +} diff --git a/sass/base/_reset.scss b/sass/base/_reset.scss index 726fccc466..3cf4758c7b 100644 --- a/sass/base/_reset.scss +++ b/sass/base/_reset.scss @@ -10,7 +10,7 @@ html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, abbr, address, cite, code, del, dfn, em, img, ins, kbd, q, samp, -small, strong, sub, sup, var, +small, strong, var, b, i, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, diff --git a/sass/courseware/_amplifier.scss b/sass/courseware/_amplifier.scss new file mode 100644 index 0000000000..963fdfd0cb --- /dev/null +++ b/sass/courseware/_amplifier.scss @@ -0,0 +1,94 @@ +// JM MOSFET AMPLIFIER +div#graph-container { + @extend .clearfix; + border-top: 1px solid #ddd; + padding-top: lh(1.0); + + canvas#graph { + width: flex-grid(4.5, 9); + float: left; + margin-right: flex-gutter(9); + } + + div.graph-controls { + width: flex-grid(4.5, 9); + float: left; + + select#musicTypeSelect { + display: block; + margin-bottom: lh(2); + } + + div#graph-output { + display: block; + margin-bottom: lh(2); + } + + div#graph-listen { + display: block; + margin-bottom: lh(2); + } + + p { + margin-bottom: lh(1); + } + + div#label { + display: inline-block; + } + + input#playButton { + display: block; + } + } +} + +div#schematic-container { + @extend .clearfix; + + canvas { + width: flex-grid(4.5, 9); + float: left; + margin-right: flex-gutter(9); + } + + div.schematic-sliders { + width: flex-grid(4.5, 9); + float: left; + + div.slider-label#vs { + margin-top: lh(2.0); + } + + div.slider-label { + margin-bottom: lh(0.5); + } + + div.slider { + margin-bottom: lh(1); + } + } +} +//End JM MOSFET AMPLIFIER + +// Labels +div.graph-controls, div#graph-listen { + + label { + @include border-radius(2px); + font-weight: bold; + padding: 3px; + } + + label[for="vinCheckbox"], label[for="vinRadioButton"]{ + color: desaturate(#00bfff, 50%); + } + label[for="voutCheckbox"], label[for="voutRadioButton"]{ + color: darken(#ffcf48, 20%); + } + label[for="vrCheckbox"], label[for="vrRadioButton"]{ + color: desaturate(#1df914, 40%); + } + +} + diff --git a/sass/courseware/_courseware.scss b/sass/courseware/_courseware.scss index 9d7ab8123a..52525a5a88 100644 --- a/sass/courseware/_courseware.scss +++ b/sass/courseware/_courseware.scss @@ -5,10 +5,6 @@ div.course-wrapper { list-style: none; } - .tran { - @include transition( all, .2s, $ease-in-out-quad); - } - section.course-content { @extend .content; @@ -40,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; @@ -50,6 +46,12 @@ div.course-wrapper { width: auto; border-right: 0; } + + @media print { + display: block; + width: auto; + border-right: 0; + } } section.problem { @@ -63,6 +65,16 @@ div.course-wrapper { padding: 0; } + @media print { + display: block; + width: auto; + padding: 0; + + canvas, img { + page-break-inside: avoid; + } + } + span { &.unanswered, &.ui-icon-bullet { @include inline-block(); @@ -133,7 +145,7 @@ div.course-wrapper { div#seq_content { h1 { background: none; - margin-bottom: 0; + margin-bottom: lh(); padding-bottom: 0; border-bottom: none; } @@ -160,7 +172,7 @@ div.course-wrapper { section.course-index { width: flex-grid(.6); - div#open_close_accordion { + header#open_close_accordion { padding: 0; a { diff --git a/sass/courseware/_sequence-nav.scss b/sass/courseware/_sequence-nav.scss index fb2534c4f5..99e29a39d2 100644 --- a/sass/courseware/_sequence-nav.scss +++ b/sass/courseware/_sequence-nav.scss @@ -6,102 +6,151 @@ 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: #DCCDA2; + background-repeat: no-repeat; + @include box-shadow(inset 0 0 3px darken(#dccda2, 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: 15px 4px 14px; + 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: #333; + padding: 6px; + white-space: pre-wrap; + z-index: 99; + margin: 4px 0 0 -5px; + text-shadow: 0 -1px 0 #000; + color: #fff; + line-height: lh(); + + &:empty { + background: none; + + &::after { + display: none; + } + } + + &::after { + background: #333; + content: " "; + display: block; + height: 10px; + position: absolute; + top: -5px; + left: 18px; + @include transform(rotate(45deg)); + @include transition(); + width: 10px; + } + } } } @@ -124,7 +173,7 @@ nav.sequence-nav { border-left: 1px solid darken(#f6efd4, 20%); cursor: pointer; display: table-cell; - padding: 14px 4px; + padding: 0 4px; text-indent: -9999px; width: 82px; diff --git a/sass/courseware/_sidebar.scss b/sass/courseware/_sidebar.scss index 3f937433f2..98659f12e0 100644 --- a/sass/courseware/_sidebar.scss +++ b/sass/courseware/_sidebar.scss @@ -2,34 +2,6 @@ section.course-index { @extend .sidebar; @extend .tran; - div#open_close_accordion { - @include box-shadow(0 1px 0 #eee); - border-bottom: 1px solid #d3d3d3; - padding: 0 lh(); - position: relative; - - h2 { - padding-right: 20px; - } - - a { - width: 16px; - text-indent: -9999px; - height: 16px; - position: absolute; - padding: 8px; - top: -12px; - right: -1px; - border: 1px solid #D3D3D3; - background: #eee url('/static/images/slide-left-icon.png') center center no-repeat; - @include border-radius(3px 0 0 3px); - - &:hover { - background-color: white; - } - } - } - div#accordion { h3 { diff --git a/sass/courseware/_video.scss b/sass/courseware/_video.scss index 264bcc953d..cc176b71b1 100644 --- a/sass/courseware/_video.scss +++ b/sass/courseware/_video.scss @@ -1,185 +1,239 @@ section.course-content { + div.video-subtitles { + position: relative; - div.video-wrapper { - float: left; - width: flex-grid(6, 9); - margin-right: flex-gutter(9); + div.video-wrapper { + float: left; + width: flex-grid(6, 9); + margin-right: flex-gutter(9); - div.video-player { - position: relative; - padding-bottom: 56.25%; - padding-top: 30px; - height: 0; - overflow: hidden; + div.video-player { + position: relative; + padding-bottom: 56.25%; + padding-top: 30px; + height: 0; + overflow: hidden; - object { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; + object { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + } + + iframe#html5_player { + border: none; + display: none; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + } } - iframe#html5_player { - border: none; - display: none; - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - } - } + // ul { + // float: left; - // ul { - // float: left; + // li { + // margin-top: 5px; + // display: inline-block; + // cursor: pointer; + // border: 0; + // padding: 0; - // li { - // margin-top: 5px; - // display: inline-block; - // cursor: pointer; - // border: 0; - // padding: 0; + // div { + // &:empty { + // display: none; + // } + // } + // } + // } - // div { - // &:empty { - // display: none; - // } - // } - // } - // } - - section.video-controls { - @extend .clearfix; - background: #333; - border: 1px solid #000; - color: #ccc; - - div#slider { + section.video-controls { @extend .clearfix; - @include border-radius(0); - @include box-shadow(inset 0 1px 0 #eee, 0 1px 0 #555); - background: #c2c2c2; - border: none; - border-bottom: 1px solid #000; - height: 14px; + background: #333; + position: relative; + border: 1px solid #000; + color: #ccc; - a.ui-slider-handle { - @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: 1px solid darken($mit-red, 20%); - cursor: pointer; - height: 20px; - margin-left: -10px; - top: -4px; - width: 20px; + div#slider { + @extend .clearfix; + @include border-radius(0); + @include box-shadow(inset 0 1px 0 #eee, 0 1px 0 #555); + background: #c2c2c2; + border: none; + border-bottom: 1px solid #000; + height: 14px; - &:focus { - outline: none; + a.ui-slider-handle { + @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: 1px solid darken($mit-red, 20%); + cursor: pointer; + height: 20px; + margin-left: -10px; + top: -4px; + width: 20px; + + &:focus { + outline: none; + } } } - } - ul.vcr { - float: left; - margin-right: lh(); - - li { + ul.vcr { float: left; - margin-bottom: 0; + margin-right: lh(); - a { - @include box-shadow(1px 0 0 #555); - border-right: 1px solid #000; - display: block; - cursor: pointer; - height: 14px; - padding: lh(.75) lh(); - text-indent: -9999px; - width: 14px; - - &.play { - background: url('/static/images/play-icon.png') center center no-repeat; - - &:hover { - background-color: #444; - } - } - - &.pause { - background: url('/static/images/pause-icon.png') center center no-repeat; - - &:hover { - background-color: #444; - } - } - } - } - } - - div#vidtime { - float: left; - font-weight: bold; - line-height: 46px; //height of play pause buttons - -webkit-font-smoothing: antialiased; - } - - div.speeds { - float: right; - line-height: 46px; //height of play pause buttons - margin-right: lh(); - -webkit-font-smoothing: antialiased; - - div#video_speeds { - @include inline-block(); - font-weight: bold; - - span { - @include inline-block(); - cursor: pointer; + li { + float: left; margin-bottom: 0; + a { + @include box-shadow(1px 0 0 #555); + border-right: 1px solid #000; + display: block; + cursor: pointer; + height: 14px; + padding: lh(.75) lh(); + text-indent: -9999px; + width: 14px; + + &.play { + background: url('/static/images/play-icon.png') center center no-repeat; + + &:hover { + background-color: #444; + } + } + + &.pause { + background: url('/static/images/pause-icon.png') center center no-repeat; + + &:hover { + background-color: #444; + } + } + + } + + div#vidtime { + padding-left: lh(); + font-weight: bold; + line-height: 46px; //height of play pause buttons + -webkit-font-smoothing: antialiased; + } + } + } + + div.secondary-controls { + 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 + margin-right: 0; + -webkit-font-smoothing: antialiased; + + h3 { + @include inline-block(); + + a { + color: #fff; + padding: 0 lh(.5); + @include inline-block(); + + &:hover { + text-decoration: none; + // background-color: #444; + } + } + } + + // fix for now + ol#video_speeds { + @include inline-block(); + padding-right: lh(.5); + + li { + cursor: pointer; + @include inline-block(); + } + } + } + + a.hide-subtitles { + float: left; + display: block; + padding-right: lh(.5); + margin-left: 0; + color: #797979; + padding-left: 50px; + line-height: 46px; //height of play pause buttons + font-weight: 800; + background: url('/static/images/cc.png') 16px center no-repeat; + -webkit-font-smoothing: antialiased; + &:hover { - color: $mit-red; + color: #fff; + text-decoration: none; + background-color: #444; } } } } } - } - ol.subtitles { - float: left; - width: flex-grid(3, 9); - height: 530px; - overflow: hidden; + ol.subtitles { + float: left; + width: flex-grid(3, 9); + height: 530px; + overflow: hidden; - li { - margin-bottom: 0px; - cursor: pointer; - border: 0; - padding: 0; - color: #666; - - &.current { - background-color: #f3f3f3; - color: #333; - } - - &:hover { - color: $mit-red; - } - - div { - margin-bottom: 8px; - } - - div:empty { + li { margin-bottom: 0px; + cursor: pointer; + border: 0; + padding: 0; + color: #666; + + &.current { + background-color: #f3f3f3; + color: #333; + } + + &:hover { + color: $mit-red; + } + + div { + margin-bottom: 8px; + } + + div:empty { + margin-bottom: 0px; + } + } + } + + &.closed { + @extend .trans; + + div.video-wrapper { + width: flex-grid(9,9); + } + + ol.subtitles { + width: 0px; + height: 0; } } } - } diff --git a/sass/discussion/_answers.scss b/sass/discussion/_answers.scss index 747ffc29ae..6ceead2514 100644 --- a/sass/discussion/_answers.scss +++ b/sass/discussion/_answers.scss @@ -74,11 +74,21 @@ div.answer-block { } } + div.accepted-answer { + p { + color:#000; + } + } + div.deleted { p { color: $mit-red; } } + + img.answer-img-accept { + opacity: 0.7; + } } div.paginator { @@ -141,3 +151,4 @@ div.answer-actions { } } + diff --git a/sass/discussion/_askbot-original.scss b/sass/discussion/_askbot-original.scss index d6ae9b96a4..66b59855e1 100644 --- a/sass/discussion/_askbot-original.scss +++ b/sass/discussion/_askbot-original.scss @@ -1165,13 +1165,13 @@ body.anon #searchbar { font-weight: normal; cursor: help; } -.question-options { - margin-top: 1px; - color: #666; - line-height: 13px; - margin-bottom: 5px; - label { - vertical-align: text-bottom; } } +// .question-options { +// margin-top: 1px; +// color: #666; +// line-height: 13px; +// margin-bottom: 5px; +// label { +// vertical-align: text-bottom; } } // .edit-content-html { // border-top: 1px dotted #d8d2a9; @@ -1652,73 +1652,73 @@ body.anon #searchbar { // padding: 5px; // margin: 0px 0 10px 0; } } -@media screen and (-webkit-min-device-pixel-ratio:0) { - textarea { - padding-left: 3px !important; } } +// @media screen and (-webkit-min-device-pixel-ratio:0) { +// textarea { +// padding-left: 3px !important; } } -.facebook-share.icon, .twitter-share.icon, .linkedin-share.icon, .identica-share.icon { - background: url(../images/socialsprite.png) no-repeat; - display: block; - text-indent: -100em; - height: 25px; - width: 25px; - margin-bottom: 3px; } +// .facebook-share.icon, .twitter-share.icon, .linkedin-share.icon, .identica-share.icon { +// background: url(../images/socialsprite.png) no-repeat; +// display: block; +// text-indent: -100em; +// height: 25px; +// width: 25px; +// margin-bottom: 3px; } -.facebook-share.icon:hover, .twitter-share.icon:hover, .linkedin-share.icon:hover, .identica-share.icon:hover { - opacity: 0.8; - filter: alpha(opacity = 80); } +// .facebook-share.icon:hover, .twitter-share.icon:hover, .linkedin-share.icon:hover, .identica-share.icon:hover { +// opacity: 0.8; +// filter: alpha(opacity = 80); } -.facebook-share.icon { - background-position: -26px 0px; } +// .facebook-share.icon { +// background-position: -26px 0px; } -.identica-share.icon { - background-position: -78px 0px; } +// .identica-share.icon { +// background-position: -78px 0px; } -.twitter-share.icon { - margin-top: 10px; - background-position: 0px 0px; } +// .twitter-share.icon { +// margin-top: 10px; +// background-position: 0px 0px; } -.linkedin-share.icon { - background-position: -52px 0px; } +// .linkedin-share.icon { +// background-position: -52px 0px; } -.openid-signin, .meta, .users-page, .user-profile-edit-page { - font-size: 13px; - line-height: 1.3; - color: #525252; } +// .openid-signin, .meta, .users-page, .user-profile-edit-page { +// font-size: 13px; +// line-height: 1.3; +// color: #525252; } -.openid-signin p, .meta p, .users-page p, .user-profile-edit-page p { - font-size: 13px; - color: #707070; - line-height: 1.3; - font-family: arial; - color: #525252; - margin-bottom: 12px; } +// .openid-signin p, .meta p, .users-page p, .user-profile-edit-page p { +// font-size: 13px; +// color: #707070; +// line-height: 1.3; +// font-family: arial; +// color: #525252; +// margin-bottom: 12px; } -.openid-signin h2, .meta h2, .users-page h2, .user-profile-edit-page h2 { - color: #525252; - padding-left: 0px; - font-size: 16px; } +// .openid-signin h2, .meta h2, .users-page h2, .user-profile-edit-page h2 { +// color: #525252; +// padding-left: 0px; +// font-size: 16px; } -.openid-signin form, .meta form, .users-page form, .user-profile-edit-page form, .user-profile-page form { - margin-bottom: 15px; } +// .openid-signin form, .meta form, .users-page form, .user-profile-edit-page form, .user-profile-page form { +// margin-bottom: 15px; } -.openid-signin input[type="text"], .meta input[type="text"], .users-page input[type="text"], .user-profile-edit-page input[type="text"], .user-profile-page input[type="text"], .openid-signin input[type="password"], .meta input[type="password"], .users-page input[type="password"], .user-profile-edit-page input[type="password"], .user-profile-page input[type="password"], .openid-signin select, .meta select, .users-page select, .user-profile-edit-page select, .user-profile-page select { - border: #cce6ec 3px solid; - height: 25px; - padding-left: 5px; - width: 395px; - font-size: 14px; } +// .openid-signin input[type="text"], .meta input[type="text"], .users-page input[type="text"], .user-profile-edit-page input[type="text"], .user-profile-page input[type="text"], .openid-signin input[type="password"], .meta input[type="password"], .users-page input[type="password"], .user-profile-edit-page input[type="password"], .user-profile-page input[type="password"], .openid-signin select, .meta select, .users-page select, .user-profile-edit-page select, .user-profile-page select { +// border: #cce6ec 3px solid; +// height: 25px; +// padding-left: 5px; +// width: 395px; +// font-size: 14px; } -.openid-signin select, .meta select, .users-page select, .user-profile-edit-page select, .user-profile-page select { - width: 405px; - height: 30px; } +// .openid-signin select, .meta select, .users-page select, .user-profile-edit-page select, .user-profile-page select { +// width: 405px; +// height: 30px; } -.openid-signin textarea, .meta textarea, .users-page textarea, .user-profile-edit-page textarea, .user-profile-page textarea { - border: #cce6ec 3px solid; - padding-left: 5px; - padding-top: 5px; - width: 395px; - font-size: 14px; } +// .openid-signin textarea, .meta textarea, .users-page textarea, .user-profile-edit-page textarea, .user-profile-page textarea { +// border: #cce6ec 3px solid; +// padding-left: 5px; +// padding-top: 5px; +// width: 395px; +// font-size: 14px; } // .openid-signin input.submit, .meta input.submit, .users-page input.submit, .user-profile-edit-page input.submit, .user-profile-page input.submit { // background: url(../images/small-button-blue.png) repeat-x top; @@ -2327,14 +2327,14 @@ label.retag-error { .hilite3 { background-color: #0ff; } -.gold, .badge1 { - color: #ffcc00; } +// .gold, .badge1 { +// color: #ffcc00; } -.silver, .badge2 { - color: #cccccc; } +// .silver, .badge2 { +// color: #cccccc; } -.bronze, .badge3 { - color: #cc9933; } +// .bronze, .badge3 { +// color: #cc9933; } .score { font-weight: 800; diff --git a/sass/discussion/_badges.scss b/sass/discussion/_badges.scss new file mode 100644 index 0000000000..13adb85b74 --- /dev/null +++ b/sass/discussion/_badges.scss @@ -0,0 +1,69 @@ +div.badges-intro { + margin: 20px 0; +} + +div.badge-intro { + @extend .badges-intro; + .badge1, .badge2, .badge3 { + font-size: 20px; + } +} + +ul.badge-list { + li.badge { + border-bottom: 1px solid #eee; + @extend .clearfix; + list-style: none; + padding: 10px 0; + + &:last-child { + border-bottom: 0; + } + + div.check { + float:right; + min-width:flex-grid(1,9); + text-align:right; + + span { + font-size:19px; + padding-right:5px; + color:green; + } + } + div.badge-name { + float:left; + width:flex-grid(3,9); + + span { + font-size: 20px; + } + } + + p { + margin: 0; + float:left; + } + } +} + +.gold, .badge1 { + color: #ffcc00; +} + +.silver, .badge2 { + color: #cccccc; +} + +.bronze, .badge3 { + color: #cc9933; +} +div.badge-desc { + > div { + margin-bottom: 20px; + span { + font-size: 18px; + @include border-radius(10px); + } + } +} diff --git a/sass/discussion/_discussion.scss b/sass/discussion/_discussion.scss index 3de284476e..42d8350fef 100644 --- a/sass/discussion/_discussion.scss +++ b/sass/discussion/_discussion.scss @@ -1,5 +1,5 @@ // Base extends (Merge with main stylesheet later) -.light-button { +.light-button, a.light-button { @include box-shadow(inset 0 1px 0 #fff); @include linear-gradient(#fff, lighten(#888, 40%)); @include border-radius(3px); @@ -12,7 +12,7 @@ -webkit-font-smoothing: antialiased; &:hover, &:focus { - @include linear-gradient(#fff, lighten(#888, 30%)); + @include linear-gradient(#fff, lighten(#888, 37%)); border: 1px solid #ccc; text-decoration: none; } @@ -39,11 +39,12 @@ body.askbot { div.discussion-content { @include box-sizing(border-box); display: table-cell; + min-width: 650px; padding: lh(); vertical-align: top; width: flex-grid(9) + flex-gutter(); - .tabula-rasa { + a.tabula-rasa, .tabula-rasa{ @extend .light-button; @include border-radius(5px); display: block; @@ -58,6 +59,7 @@ body.askbot { &:first-child { margin-top: 70px; } + &:last-child { margin-bottom: 70px; } diff --git a/sass/discussion/_form-wmd-toolbar.scss b/sass/discussion/_form-wmd-toolbar.scss index be5bdaa24a..ecfe535c4a 100644 --- a/sass/discussion/_form-wmd-toolbar.scss +++ b/sass/discussion/_form-wmd-toolbar.scss @@ -3,7 +3,6 @@ } #wmd-button-bar { - background: url(/static/images/askbot/editor-toolbar-background.png) repeat-x bottom; border: 1px solid #ddd; height:36px; float:left; diff --git a/sass/discussion/_forms.scss b/sass/discussion/_forms.scss index c7cfe85648..068e439b7d 100644 --- a/sass/discussion/_forms.scss +++ b/sass/discussion/_forms.scss @@ -3,7 +3,6 @@ form.answer-form { border-top: 1px solid #ddd; overflow: hidden; padding-left: flex-grid(1.1); - // padding-top: 20px; textarea { @include box-sizing(border-box); @@ -22,13 +21,38 @@ form.answer-form { .title-desc { @include box-sizing(border-box); + @include border-radius(4px); background: #333; color: #fff; + display: none; font-size: 13px; - padding: 5px 10px; - width: flex-grid(6); + padding: 7px 14px; -webkit-font-smoothing: antialiased; } + + &:hover { + .title-desc { + display: inline-block; + position: absolute; + margin-left: 10px; + z-index: 1; + width: 200px; + + &:before { + border-color: transparent #333 transparent transparent; + border-style:solid; + border-width:12px 12px 12px 0; + content:""; + height:0; + left:-10px; + position:absolute; + top:1; + width:0; + + } + } + } + } span.form-error, label.form-error { @@ -80,12 +104,8 @@ input.after-editor { form.question-form { @extend .answer-form; border: none; - padding: 0; - margin-top: -15px; + padding: 15px 0 0 0; - h1 a { - float: right; - } input[type="text"] { @include box-sizing(border-box); @@ -96,4 +116,3 @@ form.question-form { margin-top: 10px; } } - diff --git a/sass/discussion/_modals.scss b/sass/discussion/_modals.scss index de1a27ecc9..fd05052a12 100644 --- a/sass/discussion/_modals.scss +++ b/sass/discussion/_modals.scss @@ -10,6 +10,7 @@ padding-bottom: 10px; position: absolute; text-align: center; + z-index: 1; h3 { background: $mit-red; diff --git a/sass/discussion/_profile.scss b/sass/discussion/_profile.scss index 394107a57a..dcf765aaf0 100644 --- a/sass/discussion/_profile.scss +++ b/sass/discussion/_profile.scss @@ -1,54 +1,20 @@ body.user-profile-page { - section.user-info { - // @extend .sidebar; - header { - @extend .clearfix; - section { - float: left; - width: flex-grid(2, 3); - margin-right: flex-gutter(3); - - h1 { - @extend h2; - margin-top: 0; - } - } - - p.karma { - float: left; - width: flex-grid(1, 3); - border: 1px solid #D3D3D3; - @include border-radius(3px); - @include box-shadow(inset 0 0 0 1px #fff, 0 1px 0 #fff); - background: #eee; - text-align: center; - padding: lh(.5) 0; - - - strong { - display: block; - font-style: 20px; - } - } - } - } section.questions { h1 { - @extend .top-header; + margin: 0; } } ul.sub-info { - border-top: 1px solid #ddd; + // border-top: 1px solid #ddd; margin-top: lh(); list-style: none; > li { - width: flex-grid(2.25, 9); display: table-cell; padding: (flex-gutter(9)/2); - border-right: 1px solid #ddd; + border-right: 1px dashed #efefef; @include box-sizing(border-box); &:first-child { @@ -60,7 +26,25 @@ body.user-profile-page { padding-right: 0; } + &.votes-badges { + width: flex-grid(2,9); + + p { + margin-top: 15px; + } + + } + + &.answer-list { + width: flex-grid(4, 9); + } + + &.tags-list { + width: flex-grid(3,9); + } + h2 { + margin-bottom: 30px; margin-top: 0; } @@ -74,45 +58,67 @@ body.user-profile-page { &.user-stats-table { list-style: none; + + li { + padding: 10px 0 15px; + border-top: 1px solid #eee; + } } &.vote-buttons { list-style: none; + margin-bottom: 30px; li { - @include border-radius(4px); background-color: lighten(#F6EFD4, 3%); background-position: 10px center; background-repeat: no-repeat; + @include border-radius(4px); + display: inline-block; height: 20px; padding: 10px 10px 10px 40px; - display: inline-block; &.up { - background-image: url(/static/images/askbot/vote-arrow-up.png); + background-color:#d1e3a8; + background-image: url(/static/images/askbot/vote-arrow-up-activate.png); margin-right: 6px; + + span.vote-count { + color: #3f6c3e; + } } &.down { - background-image: url(/static/images/askbot/vote-arrow-down.png); + background-image: url(/static/images/askbot/vote-arrow-down-activate.png); + background-color:#eac6ad; + + span.vote-count { + color: $mit-red; + } + } } } &.badges { - @include border-radius(4px); - background-color: #e3e3e3; @include inline-block(); a { + background-color: #e3e3e3; border: 0; - background: none; - text-transform: uppercase; + @include border-radius(4px); color: #292309; + display: block; font-size: 12px; padding: 10px; + margin-bottom: 10px; text-shadow: 0 1px 0 #fff; - display: block; + text-transform: uppercase; + text-decoration: none; + + &:hover { + background-color: #cdcdcd; + } } } } diff --git a/sass/discussion/_question-view.scss b/sass/discussion/_question-view.scss index c83dd9f7ca..70fd3c7cd8 100644 --- a/sass/discussion/_question-view.scss +++ b/sass/discussion/_question-view.scss @@ -19,14 +19,19 @@ div.question-header { &.post-vote { @include border-radius(4px); - background-color: lighten(#F6EFD4, 3%); + background-color: lighten(#F6EFD4, 5%); + border: 1px solid darken( #F6EFD4,10% ); + @include box-shadow(inset 0 1px 0px #fff); } &.question-img-upvote, &.answer-img-upvote { background-image: url(/static/images/askbot/vote-arrow-up.png); + @include box-shadow(inset 0 1px 0px rgba(255, 255, 255, 0.5)); &:hover, &.on { background-color:#d1e3a8; + border-color: darken(#D1E3A8, 20%); + background-image: url(/static/images/askbot/vote-arrow-up-activate.png); } } @@ -34,7 +39,9 @@ div.question-header { background-image: url(/static/images/askbot/vote-arrow-down.png); &:hover, &.on { - background-color:#eac6ad; + background-color:#EAC6AD; + border-color: darken(#EAC6AD, 20%); + background-image: url(/static/images/askbot/vote-arrow-down-activate.png); } } } @@ -99,8 +106,8 @@ div.question-header { div.post-update-container { display: inline-block; float: left; - width: flex-grid(1.8,8); - border-left: 1px dotted #CCC; + width: 20%; + border-left: 1px dashed #ddd; div.post-update-info { @include box-sizing(border-box); @@ -138,7 +145,6 @@ div.question-header { } span.user-badges { - // display: block; } } } @@ -147,16 +153,15 @@ div.question-header { div.comments-container { @include box-sizing(border-box); - padding: 3%; display: inline-block; - padding: 3%; + padding: 0 0 3% 0; width: 100%; div.comments-content { font-size: 13px; - background: lighten(#efefef, 4%); + background: #efefef; - div.block { + .block { border-top: 1px solid #ddd; padding: 15px; display: block; @@ -182,6 +187,7 @@ div.question-header { aside.comment-controls { background: none; border: none; + @include box-shadow(none); display: inline-block; margin-top: -8px; padding:0 2% 0 0; @@ -250,6 +256,10 @@ div.question-header { display: inline-block; width: 95%; + &#full-width { + width: 100%; + } + div.comment-meta { text-align: right; @@ -282,8 +292,7 @@ div.question-header { } div.controls { - // padding: 15px 0; - background: lighten(#eeeeee, 4%); + border-top: 1px solid #efefef; text-align: right; a { display: inline-block; @@ -310,3 +319,12 @@ div.question-status { color: #eee; } } + +div.share-question { + padding: 10px 0 10px 7.5%; + + p { + padding: 0; + margin: 0; + } +} diff --git a/sass/discussion/_questions.scss b/sass/discussion/_questions.scss index 1a35eef69f..72e4e69444 100644 --- a/sass/discussion/_questions.scss +++ b/sass/discussion/_questions.scss @@ -1,10 +1,18 @@ div.question-list-header { display: block; - margin-bottom: 15px; + margin-bottom: 0px; overflow: hidden; width: flex-grid(9,9); @extend h1.top-header; + h1 { + margin: 0; + + > a.light-button { + float: right; + } + } + section.question-list-meta { display: block; overflow: hidden; @@ -34,7 +42,7 @@ div.question-list-header { div.question-sort { float: right; margin-left: flex-gutter(); - margin-top: 10px; + margin-top: 6px; nav { @extend .action-link; @@ -79,11 +87,13 @@ div.question-list-header { } - ul.tags li { - background: #fff; + ul.tags { + li { + background: #fff; - &:before { - border-color: transparent #fff transparent transparent; + &:before { + border-color: transparent #fff transparent transparent; + } } } } @@ -103,10 +113,10 @@ ul.question-list, div#question-list { background: #F3F3F3; ul.tags li { - background: #fff; + background: #ddd; &:before { - border-color: transparent #fff transparent transparent; + border-color: transparent #ddd transparent transparent; } } } @@ -121,7 +131,6 @@ ul.question-list, div#question-list { &.question-body { @include box-sizing(border-box); margin-right: flex-gutter(); - padding-left: 10px; width: flex-grid(5.5,9); h2 { @@ -131,9 +140,14 @@ ul.question-list, div#question-list { text-transform: none; } + p.excerpt { + color: #777; + } + div.user-info { display: inline-block; vertical-align: top; + margin-bottom: 10px; span.relative-time { font-weight: normal; @@ -151,19 +165,27 @@ ul.question-list, div#question-list { } &.question-meta { + float: right; + margin-top: 10px; width: flex-grid(3.5,9); + ul { text-align: right; li { - @include linear-gradient(#fff, #f5f5f5); border: 1px solid #ddd; + @include box-shadow(0 1px 0 #fff); display: inline-block; height:60px; + @include linear-gradient(#fff, #f5f5f5); margin-right: 10px; width: 60px; + &:last-child { + margin-right: 0px; + } + &:hover { span, div { color: #555; @@ -207,9 +229,18 @@ ul.question-list, div#question-list { div.post-own-question { padding: 11px; + margin-top: 10px; + color: #888; + text-align: center; a { font-weight: bold; + @extend .light-button; + padding: 20px; + display: block; + margin: 10px auto; + text-align: center; + width: flex-grid(5); } } } diff --git a/sass/discussion/_sidebar.scss b/sass/discussion/_sidebar.scss index 341fe7ee91..fb007bab3b 100644 --- a/sass/discussion/_sidebar.scss +++ b/sass/discussion/_sidebar.scss @@ -1,13 +1,21 @@ - div.discussion-wrapper aside { @extend .sidebar; - @include box-shadow(inset 1px 0 0 #f6f6f6); - @include border-radius(0 4px 4px 0); border-left: 1px solid #d3d3d3; + @include border-radius(0 4px 4px 0); border-right: 1px solid #f6f6f6; + @include box-shadow(inset 1px 0 0 #f6f6f6); padding: lh(); width: flex-grid(3); + &.main-sidebar { + min-width:200px; + } + + h1 { + @extend .bottom-border; + margin: (-(lh())) (-(lh())) 0; + padding: lh(.5) lh(); + } h2 { color: #4D4D4D; @@ -22,22 +30,40 @@ div.discussion-wrapper aside { box-shadow: none; } - input[type="text"] { - width: 76%; + div.inputs { + input[type="submit"] { + width: 27%; + float: right; + } + + input[type="text"] { + width: 62%; + } } div.box { - @include box-shadow(0 1px 0 #eee); - border-bottom: 1px solid #d3d3d3; display: block; - padding-bottom: 20px; - overflow: hidden; + margin: lh(.5) 0; &:last-child { @include box-shadow(none); border: 0; } + h2 { + text-transform: uppercase; + font-weight: bold; + font-size: 14px; + letter-spacing: 1px; + + &:not(.first) { + @include box-shadow(inset 0 1px 0 #eee); + border-top: 1px solid #d3d3d3; + margin: 0 (-(lh())) 0; + padding: lh(.5) lh(); + } + } + &.contributors { a { @@ -70,11 +96,8 @@ div.discussion-wrapper aside { } } - #displayTagFilterControl { - margin-top: 10px; - } - div.search-box { + margin-top: lh(.5); input { @include box-sizing(border-box); display: inline; @@ -118,6 +141,34 @@ div.discussion-wrapper aside { } } + div#tagSelector { + h2 { + @include box-shadow(inset 0 1px 0 #eee); + border-top: 1px solid #d3d3d3; + margin: 0 (-(lh())) 0; + padding: lh(.5) lh(); + text-transform: uppercase; + font-weight: bold; + font-size: 14px; + letter-spacing: 1px; + } + + ul { + margin: 0; + } + + div.inputs { + margin-bottom: lh(); + } + + div#displayTagFilterControl { + p.choice { + @include inline-block(); + margin-right: lh(.5); + } + } + } + // Question view sopecific div.follow-buttons { @@ -136,11 +187,10 @@ div.discussion-wrapper aside { div.question-stats { ul { color: #777; + list-style: none; li { - @include box-shadow(0 1px 0 #eee); - border-bottom: 1px solid #d3d3d3; - padding: 7px 0; + padding: 7px 0 0; &:last-child { @include box-shadow(none); @@ -154,11 +204,105 @@ div.discussion-wrapper aside { } } + div.user-info, div.user-stats { + @extend div.question-stats; + overflow: hidden; + + div { + float: left; + display: block; + } + + div.karma { + background: #eee; + border: 1px solid #D3D3D3; + @include border-radius(3px); + @include box-sizing(border-box); + @include box-shadow(inset 0 0 0 1px #fff, 0 1px 0 #fff); + padding: lh(.4) 0; + text-align: center; + width: flex-grid(1, 3); + float: right; + + strong { + display: block; + font-style: 20px; + } + } + + div.meta { + width: flex-grid(2,3); + padding-right: flex-gutter(3)*0.5; + @include box-sizing(border-box); + + h2 { + border: 0; + @include box-shadow(none); + margin: 0 0 8px 0; + padding: 0; + } + + p { + color: #777; + font-size: 14px; + } + } + } + + div.user-stats { + overflow: visible; + + ul { + font-size: 14px; + + h2 { + margin:0 (-(lh())) 5px (-(lh())); + padding: lh(.5) lh(); + } + } + } + + div.question-tips, div.markdown { + ul { + margin-left: 8%; + } + + ol { + margin-left: 8%; + } + } div.markdown ul li { margin: 20px 0; + &:first-child { + margin: 0; + } + ol li { margin: 0; } } + + div.view-profile { + h2 { + border-top: 0; + @include box-shadow(none); + } + a { + width: 100%; + @include box-sizing(border-box); + text-align: center; + padding: 10px; + display: block; + margin-top: 10px; + + &:first-child { + margin-top: 0; + } + + span { + font-weight: bold; + } + } + } } diff --git a/sass/index/_extends.scss b/sass/index/_extends.scss index eaeb34a9e8..04bd5b83b6 100644 --- a/sass/index/_extends.scss +++ b/sass/index/_extends.scss @@ -85,3 +85,10 @@ } } +p.ie-warning { + display: block !important; + line-height: 1.3em; + background: yellow; + margin-bottom: lh(); + padding: lh(); +} diff --git a/sass/index/_footer.scss b/sass/index/_footer.scss index 5a6736ba42..dc3747dd64 100644 --- a/sass/index/_footer.scss +++ b/sass/index/_footer.scss @@ -52,6 +52,50 @@ footer { } } + + &.social { + float: right; + margin-right: 60px; + position: relative; + top: -5px; + + @media screen and (max-width: 780px) { + float: none; + } + + li { + float: left; + margin-right: lh(.5); + + &:after { + content: none; + display: none; + } + + a { + display: block; + height: 29px; + width: 28px; + text-indent: -9999px; + + &:hover { + opacity: .8; + } + } + + &.twitter a { + background: url('/static/images/marketing/twitter.png') 0 0 no-repeat; + } + + &.facebook a { + background: url('/static/images/marketing/facebook.png') 0 0 no-repeat; + } + + &.linkedin a { + background: url('/static/images/marketing/linkedin.png') 0 0 no-repeat; + } + } + } } } } diff --git a/sass/layout/_footer.scss b/sass/layout/_footer.scss index 97c28d5fd8..5edcb630b8 100644 --- a/sass/layout/_footer.scss +++ b/sass/layout/_footer.scss @@ -6,6 +6,10 @@ footer { margin-top: $body-line-height; padding: 0 $body-line-height; + @media print { + display: none; + } + p { float: left; diff --git a/sass/layout/_header.scss b/sass/layout/_header.scss index beaf1b2e45..9851339ac4 100644 --- a/sass/layout/_header.scss +++ b/sass/layout/_header.scss @@ -3,6 +3,10 @@ div.header-wrapper { border-bottom: 1px solid #fff; @include box-shadow(inset 0 -4px 6px darken($mit-red, 5%)); + @media print { + display: none; + } + header { @extend .clearfix; @extend .wrapper; diff --git a/sass/layout/_layout.scss b/sass/layout/_layout.scss index 584e1e1fa2..74efa3598f 100644 --- a/sass/layout/_layout.scss +++ b/sass/layout/_layout.scss @@ -11,13 +11,18 @@ html { section.main-content { @extend .clearfix; @extend .wrapper; - @include box-sizing(border-box); - overflow: hidden; background: #fff; + border: 1px solid #bbb; border-bottom: 1px solid #bbb; + @include box-shadow(0 0 4px #dfdfdf); + @include box-sizing(border-box); margin-top: 3px; - @include box-shadow(0 0 4px #dfdfdf); - border: 1px solid #bbb; + overflow: hidden; + + @media print { + border-bottom: 0; + @include border-radius(none); + } @media screen and (min-width: 1400px) { @include border-radius(4px); diff --git a/sass/layout/_leanmodal.scss b/sass/layout/_leanmodal.scss index fc235a6705..b9399a39e4 100644 --- a/sass/layout/_leanmodal.scss +++ b/sass/layout/_leanmodal.scss @@ -47,12 +47,9 @@ div.leanModal_box { &#enroll { max-width: 600px; - p.ie-warning { - display: none; - } - ol { @extend .clearfix; + padding-top: lh(); li { diff --git a/sass/marketing-ie.scss b/sass/marketing-ie.scss index 43c1e06f12..c92fd2f7fb 100644 --- a/sass/marketing-ie.scss +++ b/sass/marketing-ie.scss @@ -9,11 +9,6 @@ body { } div#enroll { - p.ie-warning { - display: block !important; - line-height: 1.3em; - } - form { display: none; } diff --git a/sass/_jquery-ui-1.8.16.custom.scss b/sass/plugins/_jquery-ui-1.8.16.custom.scss similarity index 100% rename from sass/_jquery-ui-1.8.16.custom.scss rename to sass/plugins/_jquery-ui-1.8.16.custom.scss diff --git a/sass/print.scss b/sass/print.scss index 12436ba683..8b13789179 100644 --- a/sass/print.scss +++ b/sass/print.scss @@ -1,6 +1 @@ -.header-wrapper {display:none;} -#accordion {display:none;} -.ui-accordion {display:none; -visibility:hidden; -width:0%; -} + diff --git a/sass/wiki/_sidebar.scss b/sass/wiki/_sidebar.scss index 513b3c2556..61575d811d 100644 --- a/sass/wiki/_sidebar.scss +++ b/sass/wiki/_sidebar.scss @@ -2,6 +2,13 @@ div#wiki_panel { @extend .sidebar; overflow: auto; + h2 { + padding: lh(.5) lh(); + font-size: 18px; + margin: 0 ; + @extend .bottom-border; + } + input[type="button"] { @extend h3; @include transition(); diff --git a/sass/wiki/_table.scss b/sass/wiki/_table.scss new file mode 100644 index 0000000000..ffb2796906 --- /dev/null +++ b/sass/wiki/_table.scss @@ -0,0 +1,48 @@ +table.wiki-history { + thead { + background: #ddd; + // border-bottom: 1px solid #ddd; + + tr { + height: 40px; + + th { + padding-top: 10px; + padding-left: 15px; + + &#revision { + width: 5%; + } + + &#comment { + width: 15%; + } + + &#diff { + width: 60%; + } + + &#modified { + width:20%; + } + } + } + } + tbody { + tr td { + padding: 8px 15px; + } + } + + tr.dark { + background-color: #efefef; + } +} + +div.history-controls { + margin-top: 20px; + + input[type="submit"] { + @extend .light-button; + } +} diff --git a/sass/wiki/_wiki.scss b/sass/wiki/_wiki.scss index 8078273514..9a8788bdd4 100644 --- a/sass/wiki/_wiki.scss +++ b/sass/wiki/_wiki.scss @@ -3,13 +3,19 @@ div.wiki-wrapper { width: 100%; section.wiki-body { + @extend .clearfix; @extend .content; + position: relative; + header { @extend .topbar; + height:46px; + @include box-shadow(inset 0 1px 0 white); &:empty { display: none !important; + border-bottom: 0; } a { @@ -18,10 +24,10 @@ div.wiki-wrapper { p { float: left; - padding: 15px; margin-bottom: 0; color: darken(#F6EFD4, 55%); - line-height: 1em; + line-height: 46px; + padding-left: lh(); } ul { @@ -32,44 +38,123 @@ div.wiki-wrapper { float: left; input[type="button"] { - @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); - @include border-radius(0); - @include transition(); - background: darken(#F6EFD4, 5%); + @extend .block-link; + background-color: darken(#F6EFD4, 5%); + background-position: 12px center; + background-repeat: no-repeat; border: 0; border-left: 1px solid darken(#f6efd4, 20%); + @include border-radius(0); + @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); color: darken(#F6EFD4, 80%); - text-shadow: none; + display: block; font-weight: normal; font-size: 12px; - text-transform: uppercase; letter-spacing: 1px; - padding: 14px; + line-height: 46px; margin: 0; + padding: 0 lh() 0 38px; + text-shadow: none; + text-transform: uppercase; + @include transition(); + + &.view { + background-image: url('/static/images/sequence-nav/view.png'); + } + + &.history { + background-image: url('/static/images/sequence-nav/history.png'); + } + + &.edit { + background-image: url('/static/images/sequence-nav/edit.png'); + } &:hover { - background: none; + background-color: transparent; } } } } } - h1.wiki-title { - font-weight: bold; - padding-bottom: 10px; - margin-bottom: 20px; - border-bottom: 1px solid #ccc; - } + h2.wiki-title { + @include box-sizing(border-box); + display: inline-block; + float: left; + margin-bottom: 15px; + margin-top: 0; + padding-right: flex-gutter(9); + vertical-align: top; + width: flex-grid(2.5, 9); + + @media screen and (max-width:900px) { + display: block; + width: auto; + border-right: 0; + } + + @media print { + display: block; + width: auto; + border-right: 0; + } + } p { line-height: 1.6em; } - #wiki_history_table { - tr.dark { - background-color: $light-gray; + section.results { + @include box-sizing(border-box); + display: inline-block; + border-left: 1px dashed #ddd; + float: left; + padding-left: 10px; + width: flex-grid(6.5, 9); + + @media screen and (max-width:900px) { + border: 0; + display: block; + padding-left: 0; + width: 100%; + width: auto; + } + + @media print { + display: block; + width: auto; + padding: 0; + + canvas, img { + page-break-inside: avoid; + } + } + + ul.article-list { + margin-left: 15px; + width: 100%; + + @media screen and (max-width:900px) { + margin-left: 0px; + } + + li { + list-style: none; + margin: 0; + padding: 10px 0; + border-bottom: 1px solid #eee; + + &:last-child { + border-bottom: 0; + } + h3 { + font-size: 18px; + font-weight: normal; + } + } } } + } } diff --git a/seq_module.html b/seq_module.html index 3f28739a55..3df90fc343 100644 --- a/seq_module.html +++ b/seq_module.html @@ -1,7 +1,7 @@ - - -
      - +
      diff --git a/seq_module.js b/seq_module.js index 57b73543c6..c7b9fabab9 100644 --- a/seq_module.js +++ b/seq_module.js @@ -2,27 +2,29 @@ var ${ id }contents=["", %for t in items: - ${t[1]['content']} , + ${t['content']} , %endfor "" ]; var ${ id }types=["", %for t in items: - "${t[1]['type']}" , + "${t['type']}" , %endfor "" ]; var ${ id }init_functions=["", %for t in items: - function(){ ${t[1]['init_js']} }, + function(){ ${t['init_js']} }, %endfor ""]; +var ${ id }titles=${titles}; + var ${ id }destroy_functions=["", %for t in items: - function(){ ${t[1]['destroy_js']} }, + function(){ ${t['destroy_js']} }, %endfor ""]; @@ -52,6 +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).parent().append("

      " + ${ id }titles[i-1] + "

      "); } diff --git a/simplewiki_base.html b/simplewiki_base.html index 0f4e70cb2c..0f08d612c8 100644 --- a/simplewiki_base.html +++ b/simplewiki_base.html @@ -71,12 +71,14 @@ <%block name="bodyextra"> + <%include file="navigation.html" args="active_page='wiki'" />
      <%block name="wiki_panel">
      +

      Course Wiki

      <% if (wiki_article is not UNDEFINED): baseURL = reverse("wiki_view", args=[wiki_article.get_url()]) @@ -120,14 +122,14 @@
    1. - - -
      - -
      - - - +
      + +
      + +
      + + +
      2. @@ -135,34 +137,33 @@
      -
      %if wiki_article is not UNDEFINED: +
      %if wiki_article.locked: -

      This article has been locked

      +

      This article has been locked

      %endif -

      Last modified: ${wiki_article.modified_on.strftime("%b %d, %Y, %I:%M %p")}

      +

      Last modified: ${wiki_article.modified_on.strftime("%b %d, %Y, %I:%M %p")}

      %endif - %if wiki_article is not UNDEFINED: -
        + %if wiki_article is not UNDEFINED: +
          -
        • - -
          • +
        • + +
          • -
        • - -
          • +
        • + +
          • -
        • - -
          • -
        +
      • + +
        • +
      +
      %endif -
      - -

      <%block name="wiki_page_title"/>

      + <%block name="wiki_page_title"/> <%block name="wiki_body"/>
      diff --git a/simplewiki_create.html b/simplewiki_create.html index a2161a22a7..9c29c214b2 100644 --- a/simplewiki_create.html +++ b/simplewiki_create.html @@ -2,10 +2,10 @@ <%inherit file="simplewiki_base.html"/> -<%block name="title">Create Article - MITx 6.002 Wiki +<%block name="title">Create Article - MITx 6.002x Wiki <%block name="wiki_page_title"> -Create article +

      Create article

      <%block name="wiki_body"> diff --git a/simplewiki_edit.html b/simplewiki_edit.html index 54fe13fe24..435870071d 100644 --- a/simplewiki_edit.html +++ b/simplewiki_edit.html @@ -2,10 +2,10 @@ <%inherit file="simplewiki_base.html"/> -<%block name="title">${"Edit " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki +<%block name="title">${"Edit " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002x Wiki <%block name="wiki_page_title"> -${ wiki_article.title } +

      ${ wiki_article.title }

      <%block name="wiki_head"> diff --git a/simplewiki_error.html b/simplewiki_error.html index 8b7324a998..cdb46c1a0f 100644 --- a/simplewiki_error.html +++ b/simplewiki_error.html @@ -6,11 +6,11 @@ from django.core.urlresolvers import reverse %> -<%block name="title">Oops... - MITx 6.002 Wiki +<%block name="title">Oops... - MITx 6.002x Wiki <%block name="wiki_page_title"> -Oops... +

      Oops...

      diff --git a/simplewiki_history.html b/simplewiki_history.html index 87daba9f21..9385ff8d87 100644 --- a/simplewiki_history.html +++ b/simplewiki_history.html @@ -2,14 +2,16 @@ <%inherit file="simplewiki_base.html"/> -<%block name="title">${"Revision history of " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki +<%block name="title">${"Revision history of " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002x Wiki <%! from django.core.urlresolvers import reverse %> <%block name="wiki_page_title"> +

      ${ wiki_article.title } +

      <%block name="wiki_body"> @@ -17,7 +19,7 @@ ${ wiki_article.title }
      - +
      @@ -27,34 +29,34 @@ ${ wiki_article.title } - <% loopCount = 0 %> - %for revision in wiki_history: - %if revision.deleted < 2 or show_delete_revision: - <% loopCount += 1 %> - - - - - - - %endif + <% loopCount = 0 %> + %for revision in wiki_history: + %if revision.deleted < 2 or show_delete_revision: + <% loopCount += 1 %> + + + + + + + %endif %endfor %if wiki_prev_page or wiki_next_page: @@ -72,17 +74,18 @@ ${ wiki_article.title } %endif
      Revision
      - - - - ${ revision.revision_text if revision.revision_text else "None" } - %for x in revision.get_diff(): - ${x|h}
      - %endfor       		${revision.get_user()} -
      - ${revision.revision_date.strftime("%b %d, %Y, %I:%M %p")} -
      + + + + ${ revision.revision_text if revision.revision_text else "None" } + %for x in revision.get_diff(): + ${x|h}
      + %endfor       		${revision.get_user()} +
      + ${revision.revision_date.strftime("%b %d, %Y, %I:%M %p")} +
      - - -%if show_delete_revision: - - - - -%endif +
      + + %if show_delete_revision: + + + + + %endif +
      diff --git a/simplewiki_searchresults.html b/simplewiki_searchresults.html index c7d43dbeb5..fa4f699d9f 100644 --- a/simplewiki_searchresults.html +++ b/simplewiki_searchresults.html @@ -2,27 +2,33 @@ <%inherit file="simplewiki_base.html"/> -<%block name="title">Search Results - MITx 6.002 Wiki +<%block name="title">Search Results - MITx 6.002x Wiki <%! - from django.core.urlresolvers import reverse +from django.core.urlresolvers import reverse %> <%block name="wiki_page_title"> +

      %if wiki_search_query: - Search results for ${wiki_search_query | h} +Search results for ${wiki_search_query | h} %else: - Displaying all articles +Displaying all articles %endif +

      <%block name="wiki_body"> - %for article in wiki_search_results: - <% article_deleted = not article.current_revision.deleted == 0 %> - ${article.get_url()} ${'(Deleted)' if article_deleted else ''}
      - %endfor - - %if not wiki_search_results: - No articles matching ${wiki_search_query if wiki_search_query is not UNDEFINED else ""} ! - %endif +
      +
        +%for article in wiki_search_results: +<% article_deleted = not article.current_revision.deleted == 0 %> +

      • ${article.title} ${'(Deleted)' if article_deleted else ''}

        • +%endfor + +%if not wiki_search_results: +No articles matching ${wiki_search_query if wiki_search_query is not UNDEFINED else ""} ! +%endif +
      +
      diff --git a/simplewiki_view.html b/simplewiki_view.html index ef7b02d6b2..1f45515a6d 100644 --- a/simplewiki_view.html +++ b/simplewiki_view.html @@ -2,10 +2,10 @@ <%inherit file="simplewiki_base.html"/> -<%block name="title">${wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki +<%block name="title">${wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002x Wiki <%block name="wiki_page_title"> - ${ wiki_article.title } ${'- Deleted Revision!' if wiki_current_revision_deleted else ''} +

      ${ wiki_article.title } ${'- Deleted Revision!' if wiki_current_revision_deleted else ''}

      <%block name="wiki_body"> diff --git a/staticbook.html b/staticbook.html index fe3116025c..dcde36559c 100644 --- a/staticbook.html +++ b/staticbook.html @@ -1,4 +1,6 @@ <%inherit file="main.html" /> + +<%block name="js_extra"> + <%include file="navigation.html" args="active_page='book'" />
      -
        - <%include file="book_toc.html" /> -
      + +
      +
      +

      Table of Contents

      + close +
      + +
        + <%include file="book_toc.html" /> +
      +
      -