From dd6ec19e80a8627168f3d6eb9b22e291a4bb0f19 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Tue, 7 Aug 2012 11:59:49 -0400 Subject: [PATCH] Make the modal window work in the courseware --- lms/static/sass/course/base/_base.scss | 6 + lms/static/sass/marketing-ie.css | 10 - lms/static/sass/marketing.css | 1017 ----------------- lms/static/sass/shared/_modal.scss | 4 + lms/templates/profile.html | 271 +++-- lms/templates/simplewiki/simplewiki_edit.html | 4 +- .../simplewiki/simplewiki_searchresults.html | 2 +- 7 files changed, 144 insertions(+), 1170 deletions(-) delete mode 100755 lms/static/sass/marketing-ie.css delete mode 100755 lms/static/sass/marketing.css diff --git a/lms/static/sass/course/base/_base.scss b/lms/static/sass/course/base/_base.scss index aa8ab3db84..d530eb74d4 100644 --- a/lms/static/sass/course/base/_base.scss +++ b/lms/static/sass/course/base/_base.scss @@ -15,3 +15,9 @@ table { table-layout: fixed; } } + +form { + label { + display: block; + } +} diff --git a/lms/static/sass/marketing-ie.css b/lms/static/sass/marketing-ie.css deleted file mode 100755 index 18d829fdeb..0000000000 --- a/lms/static/sass/marketing-ie.css +++ /dev/null @@ -1,10 +0,0 @@ -body { - margin: 0; - padding: 0; } - -.wrapper, .subpage, section.copyright, section.tos, section.privacy-policy, section.honor-code, header.announcement div, section.index-content, footer { - margin: 0; - overflow: hidden; } - -div#enroll form { - display: none; } diff --git a/lms/static/sass/marketing.css b/lms/static/sass/marketing.css deleted file mode 100755 index 5f34ec227e..0000000000 --- a/lms/static/sass/marketing.css +++ /dev/null @@ -1,1017 +0,0 @@ -/* -html5doctor.com Reset Stylesheet -v1.6.1 -Last Updated: 2010-09-17 -Author: Richard Clark - http://richclarkdesign.com -Twitter: @rich_clark -*/ -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, var, -b, i, -dl, dt, dd, ol, ul, li, -fieldset, form, label, legend, -table, caption, tbody, tfoot, thead, tr, th, td, -article, aside, canvas, details, figcaption, figure, -footer, header, hgroup, menu, nav, section, summary, -time, mark, audio, video { - margin: 0; - padding: 0; - border: 0; - outline: 0; - font-size: 100%; - vertical-align: baseline; - background: transparent; } - -body { - line-height: 1; } - -article, aside, details, figcaption, figure, -footer, header, hgroup, menu, nav, section { - display: block; } - -nav ul { - list-style: none; } - -blockquote, q { - quotes: none; } - -blockquote:before, blockquote:after, -q:before, q:after { - content: ''; - content: none; } - -a { - margin: 0; - padding: 0; - font-size: 100%; - vertical-align: baseline; - background: transparent; } - -/* change colours to suit your needs */ -ins { - background-color: #ff9; - color: #000; - text-decoration: none; } - -/* change colours to suit your needs */ -mark { - background-color: #ff9; - color: #000; - font-style: italic; - font-weight: bold; } - -del { - text-decoration: line-through; } - -abbr[title], dfn[title] { - border-bottom: 1px dotted; - cursor: help; } - -table { - border-collapse: collapse; - border-spacing: 0; } - -/* change border colour to suit your needs */ -hr { - display: block; - height: 1px; - border: 0; - border-top: 1px solid #cccccc; - margin: 1em 0; - padding: 0; } - -input, select { - vertical-align: middle; } - -/* Generated by Font Squirrel (http://www.fontsquirrel.com) on January 25, 2012 05:06:34 PM America/New_York */ -@font-face { - font-family: 'Open Sans'; - src: url("../fonts/OpenSans-Regular-webfont.eot"); - src: url("../fonts/OpenSans-Regular-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/OpenSans-Regular-webfont.woff") format("woff"), url("../fonts/OpenSans-Regular-webfont.ttf") format("truetype"), url("../fonts/OpenSans-Regular-webfont.svg#OpenSansRegular") format("svg"); - font-weight: 600; - font-style: normal; } - -@font-face { - font-family: 'Open Sans'; - src: url("../fonts/OpenSans-Italic-webfont.eot"); - src: url("../fonts/OpenSans-Italic-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/OpenSans-Italic-webfont.woff") format("woff"), url("../fonts/OpenSans-Italic-webfont.ttf") format("truetype"), url("../fonts/OpenSans-Italic-webfont.svg#OpenSansItalic") format("svg"); - font-weight: 400; - font-style: italic; } - -@font-face { - font-family: 'Open Sans'; - src: url("../fonts/OpenSans-Bold-webfont.eot"); - src: url("../fonts/OpenSans-Bold-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/OpenSans-Bold-webfont.woff") format("woff"), url("../fonts/OpenSans-Bold-webfont.ttf") format("truetype"), url("../fonts/OpenSans-Bold-webfont.svg#OpenSansBold") format("svg"); - font-weight: 700; - font-style: normal; } - -@font-face { - font-family: 'Open Sans'; - src: url("../fonts/OpenSans-BoldItalic-webfont.eot"); - src: url("../fonts/OpenSans-BoldItalic-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/OpenSans-BoldItalic-webfont.woff") format("woff"), url("../fonts/OpenSans-BoldItalic-webfont.ttf") format("truetype"), url("../fonts/OpenSans-BoldItalic-webfont.svg#OpenSansBoldItalic") format("svg"); - font-weight: 700; - font-style: italic; } - -@font-face { - font-family: 'Open Sans'; - src: url("../fonts/OpenSans-ExtraBold-webfont.eot"); - src: url("../fonts/OpenSans-ExtraBold-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/OpenSans-ExtraBold-webfont.woff") format("woff"), url("../fonts/OpenSans-ExtraBold-webfont.ttf") format("truetype"), url("../fonts/OpenSans-ExtraBold-webfont.svg#OpenSansExtrabold") format("svg"); - font-weight: 800; - font-style: normal; } - -@font-face { - font-family: 'Open Sans'; - src: url("../fonts/OpenSans-ExtraBoldItalic-webfont.eot"); - src: url("../fonts/OpenSans-ExtraBoldItalic-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/OpenSans-ExtraBoldItalic-webfont.woff") format("woff"), url("../fonts/OpenSans-ExtraBoldItalic-webfont.ttf") format("truetype"), url("../fonts/OpenSans-ExtraBoldItalic-webfont.svg#OpenSansExtraboldItalic") format("svg"); - font-weight: 800; - font-style: italic; } - -.wrapper, .subpage, section.copyright, section.tos, section.privacy-policy, section.honor-code, header.announcement div, footer, section.index-content { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - margin: 0 auto; - max-width: 1400px; - padding: 25.888px; - width: 100%; } - -.subpage > div, section.copyright > div, section.tos > div, section.privacy-policy > div, section.honor-code > div { - padding-left: 34.171%; } - @media screen and (max-width: 940px) { - .subpage > div, section.copyright > div, section.tos > div, section.privacy-policy > div, section.honor-code > div { - padding-left: 0; } } - .subpage > div p, section.copyright > div p, section.tos > div p, section.privacy-policy > div p, section.honor-code > div p { - margin-bottom: 25.888px; - line-height: 25.888px; } - .subpage > div h1, section.copyright > div h1, section.tos > div h1, section.privacy-policy > div h1, section.honor-code > div h1 { - margin-bottom: 12.944px; } - .subpage > div h2, section.copyright > div h2, section.tos > div h2, section.privacy-policy > div h2, section.honor-code > div h2 { - font: 18px "Open Sans", Helvetica, Arial, sans-serif; - color: #000; - margin-bottom: 12.944px; } - .subpage > div ul, section.copyright > div ul, section.tos > div ul, section.privacy-policy > div ul, section.honor-code > div ul { - list-style: disc outside none; } - .subpage > div ul li, section.copyright > div ul li, section.tos > div ul li, section.privacy-policy > div ul li, section.honor-code > div ul li { - list-style: disc outside none; - line-height: 25.888px; } - .subpage > div dl, section.copyright > div dl, section.tos > div dl, section.privacy-policy > div dl, section.honor-code > div dl { - margin-bottom: 25.888px; } - .subpage > div dl dd, section.copyright > div dl dd, section.tos > div dl dd, section.privacy-policy > div dl dd, section.honor-code > div dl dd { - margin-bottom: 12.944px; } - -.clearfix:after, .subpage:after, section.copyright:after, section.tos:after, section.privacy-policy:after, section.honor-code:after, header.announcement div section:after, footer:after, section.index-content:after, section.index-content section:after, section.index-content section.about section:after, div.leanModal_box#enroll ol:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; } - -.button, header.announcement div section.course section a, section.index-content section.course a, section.index-content section.staff a, section.index-content section.about-course section.cta a.enroll { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; - border-radius: 3px; - display: -moz-inline-box; - -moz-box-orient: vertical; - display: inline-block; - vertical-align: baseline; - zoom: 1; - *display: inline; - *vertical-align: auto; - -webkit-transition-property: all; - -moz-transition-property: all; - -ms-transition-property: all; - -o-transition-property: all; - transition-property: all; - -webkit-transition-duration: 0.15s; - -moz-transition-duration: 0.15s; - -ms-transition-duration: 0.15s; - -o-transition-duration: 0.15s; - transition-duration: 0.15s; - -webkit-transition-timing-function: ease-out; - -moz-transition-timing-function: ease-out; - -ms-transition-timing-function: ease-out; - -o-transition-timing-function: ease-out; - transition-timing-function: ease-out; - -webkit-transition-delay: 0; - -moz-transition-delay: 0; - -ms-transition-delay: 0; - -o-transition-delay: 0; - transition-delay: 0; - background-color: #993333; - border: 1px solid #732626; - color: #fff; - margin: 25.888px 0 12.944px; - padding: 6.472px 12.944px; - text-decoration: none; - font-style: normal; - -webkit-box-shadow: inset 0 1px 0 #b83d3d; - -moz-box-shadow: inset 0 1px 0 #b83d3d; - box-shadow: inset 0 1px 0 #b83d3d; - -webkit-font-smoothing: antialiased; } - .button:hover, header.announcement div section.course section a:hover, section.index-content section.course a:hover, section.index-content section.staff a:hover, section.index-content section.about-course section.cta a.enroll:hover { - background-color: #732626; - border-color: #4d1919; } - .button span, header.announcement div section.course section a span, section.index-content section.course a span, section.index-content section.staff a span, section.index-content section.about-course section.cta a.enroll span { - font-family: Garamond, Baskerville, "Baskerville Old Face", "Hoefler Text", "Times New Roman", serif; - font-style: italic; } - -p.ie-warning { - display: block !important; - line-height: 1.3em; - background: yellow; - margin-bottom: 25.888px; - padding: 25.888px; } - -body { - background-color: #fff; - color: #444; - font: 16px Georgia, serif; } - body :focus { - outline-color: #ccc; } - body h1 { - font: 800 24px "Open Sans", Helvetica, Arial, sans-serif; } - body li { - margin-bottom: 25.888px; } - body em { - font-style: italic; } - body a { - color: #993333; - font-style: italic; - text-decoration: none; } - body a:hover, body a:focus { - color: #732626; } - body input[type="email"], body input[type="number"], body input[type="password"], body input[type="search"], body input[type="tel"], body input[type="text"], body input[type="url"], body input[type="color"], body input[type="date"], body input[type="datetime"], body input[type="datetime-local"], body input[type="month"], body input[type="time"], body input[type="week"], body textarea { - -webkit-box-shadow: 0 -1px 0 white; - -moz-box-shadow: 0 -1px 0 white; - box-shadow: 0 -1px 0 white; - background-color: #eeeeee; - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, white)); - background-image: -webkit-linear-gradient(top, #eeeeee, white); - background-image: -moz-linear-gradient(top, #eeeeee, white); - background-image: -ms-linear-gradient(top, #eeeeee, white); - background-image: -o-linear-gradient(top, #eeeeee, white); - background-image: linear-gradient(top, #eeeeee, white); - border: 1px solid #999; - font: 16px Georgia, serif; - padding: 4px; - width: 100%; } - body input[type="email"]:focus, body input[type="number"]:focus, body input[type="password"]:focus, body input[type="search"]:focus, body input[type="tel"]:focus, body input[type="text"]:focus, body input[type="url"]:focus, body input[type="color"]:focus, body input[type="date"]:focus, body input[type="datetime"]:focus, body input[type="datetime-local"]:focus, body input[type="month"]:focus, body input[type="time"]:focus, body input[type="week"]:focus, body textarea:focus { - border-color: #993333; } - -header.announcement { - -webkit-background-size: cover; - -moz-background-size: cover; - -ms-background-size: cover; - -o-background-size: cover; - background-size: cover; - background: #333; - border-bottom: 1px solid #000; - color: #fff; - -webkit-font-smoothing: antialiased; } - header.announcement.home { - background: #e3e3e3 url("../images/marketing/shot-5-medium.jpg"); } - @media screen and (min-width: 1200px) { - header.announcement.home { - background: #e3e3e3 url("../images/marketing/shot-5-large.jpg"); } } - header.announcement.home div { - padding: 258.88px 25.888px 77.664px; } - @media screen and (max-width:780px) { - header.announcement.home div { - padding: 64.72px 25.888px 51.776px; } } - header.announcement.home div nav h1 { - margin-right: 0; } - header.announcement.home div nav a.login { - display: none; } - header.announcement.course { - background: #e3e3e3 url("../images/marketing/course-bg-small.jpg"); } - @media screen and (min-width: 1200px) { - header.announcement.course { - background: #e3e3e3 url("../images/marketing/course-bg-large.jpg"); } } - @media screen and (max-width: 1199px) and (min-width: 700px) { - header.announcement.course { - background: #e3e3e3 url("../images/marketing/course-bg-medium.jpg"); } } - header.announcement.course div { - padding: 103.552px 25.888px 51.776px; } - @media screen and (max-width:780px) { - header.announcement.course div { - padding: 64.72px 25.888px 51.776px; } } - header.announcement div { - position: relative; } - header.announcement div nav { - position: absolute; - top: 0; - right: 25.888px; - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - -ms-border-radius: 0 0 3px 3px; - -o-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - background: #333; - background: rgba(0, 0, 0, 0.7); - padding: 12.944px 25.888px; } - header.announcement div nav h1 { - display: -moz-inline-box; - -moz-box-orient: vertical; - display: inline-block; - vertical-align: baseline; - zoom: 1; - *display: inline; - *vertical-align: auto; - margin-right: 12.944px; } - header.announcement div nav h1 a { - font: italic 800 18px "Open Sans", Helvetica, Arial, sans-serif; - color: #fff; - text-decoration: none; } - header.announcement div nav h1 a:hover, header.announcement div nav h1 a:focus { - color: #999; } - header.announcement div nav a.login { - text-decoration: none; - color: #fff; - font-size: 12px; - font-style: normal; - font-family: "Open Sans", Helvetica, Arial, sans-serif; } - header.announcement div nav a.login:hover, header.announcement div nav a.login:focus { - color: #999; } - header.announcement div section { - background: #993333; - display: -moz-inline-box; - -moz-box-orient: vertical; - display: inline-block; - vertical-align: baseline; - zoom: 1; - *display: inline; - *vertical-align: auto; - margin-left: 34.171%; - padding: 25.888px 38.832px; } - @media screen and (max-width: 780px) { - header.announcement div section { - margin-left: 0; } } - header.announcement div section h1 { - font-family: "Open Sans"; - font-size: 30px; - font-weight: 800; - display: -moz-inline-box; - -moz-box-orient: vertical; - display: inline-block; - vertical-align: baseline; - zoom: 1; - *display: inline; - *vertical-align: auto; - line-height: 1.2em; - margin: 0 25.888px 0 0; } - header.announcement div section h2 { - font-family: "Open Sans"; - font-size: 24px; - font-weight: 400; - display: -moz-inline-box; - -moz-box-orient: vertical; - display: inline-block; - vertical-align: baseline; - zoom: 1; - *display: inline; - *vertical-align: auto; - line-height: 1.2em; } - header.announcement div section.course section { - float: left; - margin-left: 0; - margin-right: 3.817%; - padding: 0; - width: 48.092%; } - @media screen and (max-width: 780px) { - header.announcement div section.course section { - float: none; - width: 100%; - margin-right: 0; } } - header.announcement div section.course section a { - background-color: #4d1919; - border-color: #260d0d; - -webkit-box-shadow: inset 0 1px 0 #732626, 0 1px 0 #ac3939; - -moz-box-shadow: inset 0 1px 0 #732626, 0 1px 0 #ac3939; - box-shadow: inset 0 1px 0 #732626, 0 1px 0 #ac3939; - display: block; - padding: 12.944px 25.888px; - text-align: center; } - header.announcement div section.course section a:hover { - background-color: #732626; - border-color: #4d1919; } - header.announcement div section.course p { - width: 48.092%; - line-height: 25.888px; - float: left; } - @media screen and (max-width: 780px) { - header.announcement div section.course p { - float: none; - width: 100%; } } - -footer { - padding-top: 0; } - footer div.footer-wrapper { - border-top: 1px solid #e5e5e5; - padding: 25.888px 0; - background: url("../images/marketing/mit-logo.png") right center no-repeat; } - @media screen and (max-width: 780px) { - footer div.footer-wrapper { - background-position: left bottom; - padding-bottom: 77.664px; } } - footer div.footer-wrapper a { - color: #888; - text-decoration: none; - -webkit-transition-property: all; - -moz-transition-property: all; - -ms-transition-property: all; - -o-transition-property: all; - transition-property: all; - -webkit-transition-duration: 0.15s; - -moz-transition-duration: 0.15s; - -ms-transition-duration: 0.15s; - -o-transition-duration: 0.15s; - transition-duration: 0.15s; - -webkit-transition-timing-function: ease-out; - -moz-transition-timing-function: ease-out; - -ms-transition-timing-function: ease-out; - -o-transition-timing-function: ease-out; - transition-timing-function: ease-out; - -webkit-transition-delay: 0; - -moz-transition-delay: 0; - -ms-transition-delay: 0; - -o-transition-delay: 0; - transition-delay: 0; } - footer div.footer-wrapper a:hover, footer div.footer-wrapper a:focus { - color: #666; } - footer div.footer-wrapper p { - display: -moz-inline-box; - -moz-box-orient: vertical; - display: inline-block; - vertical-align: baseline; - zoom: 1; - *display: inline; - *vertical-align: auto; - margin-right: 25.888px; } - footer div.footer-wrapper ul { - display: -moz-inline-box; - -moz-box-orient: vertical; - display: inline-block; - vertical-align: baseline; - zoom: 1; - *display: inline; - *vertical-align: auto; } - @media screen and (max-width: 780px) { - footer div.footer-wrapper ul { - margin-top: 25.888px; } } - footer div.footer-wrapper ul li { - display: -moz-inline-box; - -moz-box-orient: vertical; - display: inline-block; - vertical-align: baseline; - zoom: 1; - *display: inline; - *vertical-align: auto; - margin-bottom: 0; } - footer div.footer-wrapper ul li:after { - content: ' |'; - display: inline; - color: #ccc; } - footer div.footer-wrapper ul li:last-child:after { - content: none; } - footer div.footer-wrapper ul.social { - float: right; - margin-right: 60px; - position: relative; - top: -5px; } - @media screen and (max-width: 780px) { - footer div.footer-wrapper ul.social { - float: none; } } - footer div.footer-wrapper ul.social li { - float: left; - margin-right: 12.944px; } - footer div.footer-wrapper ul.social li:after { - content: none; - display: none; } - footer div.footer-wrapper ul.social li a { - display: block; - height: 29px; - width: 28px; - text-indent: -9999px; } - footer div.footer-wrapper ul.social li a:hover { - opacity: .8; } - footer div.footer-wrapper ul.social li.twitter a { - background: url("../images/marketing/twitter.png") 0 0 no-repeat; } - footer div.footer-wrapper ul.social li.facebook a { - background: url("../images/marketing/facebook.png") 0 0 no-repeat; } - footer div.footer-wrapper ul.social li.linkedin a { - background: url("../images/marketing/linkedin.png") 0 0 no-repeat; } - -section.index-content section { - float: left; } - @media screen and (max-width: 780px) { - section.index-content section { - float: none; - width: auto; - margin-right: 0; } } - section.index-content section h1 { - font-size: 800 24px "Open Sans"; - margin-bottom: 25.888px; } - section.index-content section p { - line-height: 25.888px; - margin-bottom: 25.888px; } - section.index-content section ul { - margin: 0; } - section.index-content section.about { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - border-right: 1px solid #e5e5e5; - margin-right: 2.513%; - padding-right: 1.256%; - width: 65.829%; } - @media screen and (max-width: 780px) { - section.index-content section.about { - width: 100%; - border-right: 0; - margin-right: 0; - padding-right: 0; } } - section.index-content section.about section { - margin-bottom: 25.888px; } - section.index-content section.about section p { - width: 48.092%; - float: left; } - @media screen and (max-width: 780px) { - section.index-content section.about section p { - float: none; - width: auto; } } - section.index-content section.about section p:nth-child(odd) { - margin-right: 3.817%; } - @media screen and (max-width: 780px) { - section.index-content section.about section p:nth-child(odd) { - margin-right: 0; } } - section.index-content section.about section.intro section { - margin-bottom: 0; } - section.index-content section.about section.intro section.intro-text { - margin-right: 3.817%; - width: 48.092%; } - @media screen and (max-width: 780px) { - section.index-content section.about section.intro section.intro-text { - margin-right: 0; - width: auto; } } - section.index-content section.about section.intro section.intro-text p { - margin-right: 0; - width: auto; - float: none; } - section.index-content section.about section.intro section.intro-video { - width: 48.092%; } - @media screen and (max-width: 780px) { - section.index-content section.about section.intro section.intro-video { - width: auto; } } - section.index-content section.about section.intro section.intro-video a { - display: block; - width: 100%; } - section.index-content section.about section.intro section.intro-video a img { - width: 100%; } - section.index-content section.about section.intro section.intro-video a span { - display: none; } - section.index-content section.about section.features { - border-top: 1px solid #E5E5E5; - padding-top: 25.888px; - margin-bottom: 0; } - section.index-content section.about section.features h2 { - text-transform: uppercase; - letter-spacing: 1px; - color: #888; - margin-bottom: 25.888px; - font-weight: normal; - font-size: 14px; } - section.index-content section.about section.features h2 span { - text-transform: none; } - section.index-content section.about section.features p { - width: auto; - clear: both; } - section.index-content section.about section.features p strong { - font-family: "Open sans"; - font-weight: 800; } - section.index-content section.about section.features p a { - color: #993333; - text-decoration: none; - -webkit-transition-property: all; - -moz-transition-property: all; - -ms-transition-property: all; - -o-transition-property: all; - transition-property: all; - -webkit-transition-duration: 0.15s; - -moz-transition-duration: 0.15s; - -ms-transition-duration: 0.15s; - -o-transition-duration: 0.15s; - transition-duration: 0.15s; - -webkit-transition-timing-function: ease-out; - -moz-transition-timing-function: ease-out; - -ms-transition-timing-function: ease-out; - -o-transition-timing-function: ease-out; - transition-timing-function: ease-out; - -webkit-transition-delay: 0; - -moz-transition-delay: 0; - -ms-transition-delay: 0; - -o-transition-delay: 0; - transition-delay: 0; } - section.index-content section.about section.features p a:hover, section.index-content section.about section.features p a:focus { - color: #602020; } - section.index-content section.about section.features ul { - margin-bottom: 0; } - section.index-content section.about section.features ul li { - line-height: 25.888px; - width: 48.092%; - float: left; - margin-bottom: 12.944px; } - @media screen and (max-width: 780px) { - section.index-content section.about section.features ul li { - width: auto; - float: none; } } - section.index-content section.about section.features ul li:nth-child(odd) { - margin-right: 3.817%; } - @media screen and (max-width: 780px) { - section.index-content section.about section.features ul li:nth-child(odd) { - margin-right: 0; } } - section.index-content section.course, section.index-content section.staff { - width: 31.658%; } - @media screen and (max-width: 780px) { - section.index-content section.course, section.index-content section.staff { - width: auto; } } - section.index-content section.course h1, section.index-content section.staff h1 { - color: #888; - font: normal 16px Georgia, serif; - font-size: 14px; - letter-spacing: 1px; - margin-bottom: 25.888px; - text-transform: uppercase; } - section.index-content section.course h2, section.index-content section.staff h2 { - font: 800 24px "Open Sans", Helvetica, Arial, sans-serif; } - section.index-content section.course h3, section.index-content section.staff h3 { - font: 400 18px "Open Sans", Helvetica, Arial, sans-serif; } - section.index-content section.course a span.arrow, section.index-content section.staff a span.arrow { - color: rgba(255, 255, 255, 0.6); - font-style: normal; - display: -moz-inline-box; - -moz-box-orient: vertical; - display: inline-block; - vertical-align: baseline; - zoom: 1; - *display: inline; - *vertical-align: auto; - padding-left: 10px; } - section.index-content section.course ul, section.index-content section.staff ul { - list-style: none; } - section.index-content section.course ul li img, section.index-content section.staff ul li img { - float: left; - margin-right: 12.944px; } - section.index-content section.course h2 { - padding-top: 129.44px; - background: url("../images/marketing/circuits-bg.jpg") 0 0 no-repeat; - -webkit-background-size: contain; - -moz-background-size: contain; - -ms-background-size: contain; - -o-background-size: contain; - background-size: contain; } - @media screen and (max-width: 998px) and (min-width: 781px) { - section.index-content section.course h2 { - background: url("../images/marketing/circuits-medium-bg.jpg") 0 0 no-repeat; } } - @media screen and (max-width: 780px) { - section.index-content section.course h2 { - padding-top: 129.44px; - background: url("../images/marketing/circuits-bg.jpg") 0 0 no-repeat; } } - @media screen and (min-width: 500px) and (max-width: 781px) { - section.index-content section.course h2 { - padding-top: 207.104px; } } - section.index-content section.course div.announcement p.announcement-button a { - margin-top: 0; } - section.index-content section.course div.announcement img { - max-width: 100%; - margin-bottom: 25.888px; } - section.index-content section.about-course { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - border-right: 1px solid #e5e5e5; - margin-right: 2.513%; - padding-right: 1.256%; - width: 65.829%; } - @media screen and (max-width: 780px) { - section.index-content section.about-course { - width: auto; - border-right: 0; - margin-right: 0; - padding-right: 0; } } - section.index-content section.about-course section { - width: 48.092%; } - @media screen and (max-width: 780px) { - section.index-content section.about-course section { - width: auto; } } - section.index-content section.about-course section.about-info { - margin-right: 3.817%; } - @media screen and (max-width: 780px) { - section.index-content section.about-course section.about-info { - margin-right: 0; } } - section.index-content section.about-course section.requirements { - clear: both; - width: 100%; - border-top: 1px solid #E5E5E5; - padding-top: 25.888px; - margin-bottom: 0; } - section.index-content section.about-course section.requirements p { - float: left; - width: 48.092%; - margin-right: 3.817%; } - @media screen and (max-width: 780px) { - section.index-content section.about-course section.requirements p { - margin-right: 0; - float: none; - width: auto; } } - section.index-content section.about-course section.requirements p:nth-child(odd) { - margin-right: 0; } - section.index-content section.about-course section.cta { - width: 100%; - text-align: center; } - section.index-content section.about-course section.cta a.enroll { - padding: 12.944px 51.776px; - display: -moz-inline-box; - -moz-box-orient: vertical; - display: inline-block; - vertical-align: baseline; - zoom: 1; - *display: inline; - *vertical-align: auto; - text-align: center; - font: 800 18px "Open Sans", Helvetica, Arial, sans-serif; } - section.index-content section.staff h1 { - margin-top: 25.888px; } - -#lean_overlay { - background: #000; - display: none; - height: 100%; - left: 0px; - position: fixed; - top: 0px; - width: 100%; - z-index: 100; } - -div.leanModal_box { - background: #fff; - border: none; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: 0 0 6px black; - -moz-box-shadow: 0 0 6px black; - box-shadow: 0 0 6px black; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - display: none; - padding: 51.776px; - text-align: left; } - div.leanModal_box a.modal_close { - color: #aaa; - display: block; - font-style: normal; - height: 14px; - position: absolute; - right: 12px; - top: 12px; - width: 14px; - z-index: 2; } - div.leanModal_box a.modal_close:hover { - color: #993333; - text-decoration: none; } - div.leanModal_box h1 { - border-bottom: 1px solid #eee; - font-size: 24px; - margin-bottom: 25.888px; - margin-top: 0; - padding-bottom: 25.888px; - text-align: left; } - div.leanModal_box#enroll { - max-width: 600px; } - div.leanModal_box#enroll ol { - padding-top: 25.888px; } - div.leanModal_box#enroll ol li.terms, div.leanModal_box#enroll ol li.honor-code { - float: none; - width: auto; } - div.leanModal_box#enroll ol li div.tip { - display: none; } - div.leanModal_box#enroll ol li:hover div.tip { - background: #333; - color: #fff; - display: block; - font-size: 16px; - line-height: 25.888px; - margin: 0 0 0 -10px; - padding: 10px; - position: absolute; - -webkit-font-smoothing: antialiased; - width: 500px; } - div.leanModal_box form { - text-align: left; } - div.leanModal_box form div#enroll_error, div.leanModal_box form div#login_error, div.leanModal_box form div#pwd_error { - background-color: #333333; - border: black; - color: #fff; - font-family: "Open sans"; - font-weight: bold; - letter-spacing: 1px; - margin: -25.888px -25.888px 25.888px; - padding: 12.944px; - text-shadow: 0 1px 0 #1a1a1a; - -webkit-font-smoothing: antialiased; } - div.leanModal_box form div#enroll_error:empty, div.leanModal_box form div#login_error:empty, div.leanModal_box form div#pwd_error:empty { - padding: 0; } - div.leanModal_box form ol { - list-style: none; - margin-bottom: 25.888px; } - div.leanModal_box form ol li { - margin-bottom: 12.944px; } - div.leanModal_box form ol li.terms, div.leanModal_box form ol li.remember { - border-top: 1px solid #eee; - clear: both; - float: none; - padding-top: 25.888px; - width: auto; } - div.leanModal_box form ol li.honor-code { - float: none; - width: auto; } - div.leanModal_box form ol li label { - display: block; - font-weight: bold; } - div.leanModal_box form ol li input[type="email"], div.leanModal_box form ol li input[type="number"], div.leanModal_box form ol li input[type="password"], div.leanModal_box form ol li input[type="search"], div.leanModal_box form ol li input[type="tel"], div.leanModal_box form ol li input[type="text"], div.leanModal_box form ol li input[type="url"], div.leanModal_box form ol li input[type="color"], div.leanModal_box form ol li input[type="date"], div.leanModal_box form ol li input[type="datetime"], div.leanModal_box form ol li input[type="datetime-local"], div.leanModal_box form ol li input[type="month"], div.leanModal_box form ol li input[type="time"], div.leanModal_box form ol li input[type="week"], div.leanModal_box form ol li textarea { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - width: 100%; } - div.leanModal_box form ol li input[type="checkbox"] { - margin-right: 10px; } - div.leanModal_box form ol li ul { - list-style: disc outside none; - margin: 12.944px 0 25.888px 25.888px; } - div.leanModal_box form ol li ul li { - color: #666; - float: none; - font-size: 14px; - list-style: disc outside none; - margin-bottom: 12.944px; } - div.leanModal_box form input[type="button"], div.leanModal_box form input[type="submit"] { - border: 1px solid #691b1b; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: inset 0 1px 0 0 #bc5c5c; - -moz-box-shadow: inset 0 1px 0 0 #bc5c5c; - box-shadow: inset 0 1px 0 0 #bc5c5c; - color: white; - display: inline; - font-size: 11px; - font-weight: bold; - background-color: #993333; - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #993333), color-stop(100%, #761e1e)); - background-image: -webkit-linear-gradient(top, #993333, #761e1e); - background-image: -moz-linear-gradient(top, #993333, #761e1e); - background-image: -ms-linear-gradient(top, #993333, #761e1e); - background-image: -o-linear-gradient(top, #993333, #761e1e); - background-image: linear-gradient(top, #993333, #761e1e); - padding: 6px 18px 7px; - text-shadow: 0 1px 0 #5d1414; - -webkit-background-clip: padding-box; - font-size: 18px; - padding: 12.944px; } - div.leanModal_box form input[type="button"]:hover, div.leanModal_box form input[type="submit"]:hover { - -webkit-box-shadow: inset 0 1px 0 0 #a44141; - -moz-box-shadow: inset 0 1px 0 0 #a44141; - box-shadow: inset 0 1px 0 0 #a44141; - cursor: pointer; - background-color: #823030; - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #823030), color-stop(100%, #691c1c)); - background-image: -webkit-linear-gradient(top, #823030, #691c1c); - background-image: -moz-linear-gradient(top, #823030, #691c1c); - background-image: -ms-linear-gradient(top, #823030, #691c1c); - background-image: -o-linear-gradient(top, #823030, #691c1c); - background-image: linear-gradient(top, #823030, #691c1c); } - div.leanModal_box form input[type="button"]:active, div.leanModal_box form input[type="submit"]:active { - border: 1px solid #691b1b; - -webkit-box-shadow: inset 0 0 8px 4px #5c1919, inset 0 0 8px 4px #5c1919, 0 1px 1px 0 #eeeeee; - -moz-box-shadow: inset 0 0 8px 4px #5c1919, inset 0 0 8px 4px #5c1919, 0 1px 1px 0 #eeeeee; - box-shadow: inset 0 0 8px 4px #5c1919, inset 0 0 8px 4px #5c1919, 0 1px 1px 0 #eeeeee; } - -div#login { - min-width: 400px; } - div#login header { - border-bottom: 1px solid #ddd; - margin-bottom: 25.888px; - padding-bottom: 25.888px; } - div#login header h1 { - border-bottom: 0; - padding-bottom: 0; - margin-bottom: 6.472px; } - div#login ol li { - float: none; - width: auto; } - -div.lost-password { - margin-top: 25.888px; - text-align: left; } - div.lost-password a { - color: #999; } - div.lost-password a:hover { - color: #444; } - -div#pwd_reset p { - margin-bottom: 25.888px; } -div#pwd_reset input[type="email"] { - margin-bottom: 25.888px; } - -div#apply_name_change, -div#change_email, -div#unenroll, -div#deactivate-account { - max-width: 700px; } - div#apply_name_change ul, - div#change_email ul, - div#unenroll ul, - div#deactivate-account ul { - list-style: none; } - div#apply_name_change ul li, - div#change_email ul li, - div#unenroll ul li, - div#deactivate-account ul li { - margin-bottom: 12.944px; } - div#apply_name_change ul li textarea, div#apply_name_change ul li input[type="email"], div#apply_name_change ul li input[type="number"], div#apply_name_change ul li input[type="password"], div#apply_name_change ul li input[type="search"], div#apply_name_change ul li input[type="tel"], div#apply_name_change ul li input[type="text"], div#apply_name_change ul li input[type="url"], div#apply_name_change ul li input[type="color"], div#apply_name_change ul li input[type="date"], div#apply_name_change ul li input[type="datetime"], div#apply_name_change ul li input[type="datetime-local"], div#apply_name_change ul li input[type="month"], div#apply_name_change ul li input[type="time"], div#apply_name_change ul li input[type="week"], - div#change_email ul li textarea, - div#change_email ul li input[type="email"], - div#change_email ul li input[type="number"], - div#change_email ul li input[type="password"], - div#change_email ul li input[type="search"], - div#change_email ul li input[type="tel"], - div#change_email ul li input[type="text"], - div#change_email ul li input[type="url"], - div#change_email ul li input[type="color"], - div#change_email ul li input[type="date"], - div#change_email ul li input[type="datetime"], - div#change_email ul li input[type="datetime-local"], - div#change_email ul li input[type="month"], - div#change_email ul li input[type="time"], - div#change_email ul li input[type="week"], - div#unenroll ul li textarea, - div#unenroll ul li input[type="email"], - div#unenroll ul li input[type="number"], - div#unenroll ul li input[type="password"], - div#unenroll ul li input[type="search"], - div#unenroll ul li input[type="tel"], - div#unenroll ul li input[type="text"], - div#unenroll ul li input[type="url"], - div#unenroll ul li input[type="color"], - div#unenroll ul li input[type="date"], - div#unenroll ul li input[type="datetime"], - div#unenroll ul li input[type="datetime-local"], - div#unenroll ul li input[type="month"], - div#unenroll ul li input[type="time"], - div#unenroll ul li input[type="week"], - div#deactivate-account ul li textarea, - div#deactivate-account ul li input[type="email"], - div#deactivate-account ul li input[type="number"], - div#deactivate-account ul li input[type="password"], - div#deactivate-account ul li input[type="search"], - div#deactivate-account ul li input[type="tel"], - div#deactivate-account ul li input[type="text"], - div#deactivate-account ul li input[type="url"], - div#deactivate-account ul li input[type="color"], - div#deactivate-account ul li input[type="date"], - div#deactivate-account ul li input[type="datetime"], - div#deactivate-account ul li input[type="datetime-local"], - div#deactivate-account ul li input[type="month"], - div#deactivate-account ul li input[type="time"], - div#deactivate-account ul li input[type="week"] { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - display: block; - width: 100%; } - div#apply_name_change ul li textarea, - div#change_email ul li textarea, - div#unenroll ul li textarea, - div#deactivate-account ul li textarea { - height: 60px; } - div#apply_name_change ul li input[type="submit"], - div#change_email ul li input[type="submit"], - div#unenroll ul li input[type="submit"], - div#deactivate-account ul li input[type="submit"] { - white-space: normal; } - -div#feedback_div form ol li { - float: none; - width: 100%; } - div#feedback_div form ol li textarea#feedback_message { - height: 100px; } diff --git a/lms/static/sass/shared/_modal.scss b/lms/static/sass/shared/_modal.scss index f580b034cb..409c6088ec 100644 --- a/lms/static/sass/shared/_modal.scss +++ b/lms/static/sass/shared/_modal.scss @@ -299,3 +299,7 @@ } } } + +.leanModal_box { + @extend .modal; +} diff --git a/lms/templates/profile.html b/lms/templates/profile.html index 5a71946d83..16cf728d6a 100644 --- a/lms/templates/profile.html +++ b/lms/templates/profile.html @@ -25,92 +25,91 @@ ${profile_graphs.body(grade_summary, "grade-detail-graph")} var loc=true; // Activate on clicks? Not if already clicked. var lang=true; $(function() { - $("#change_location").click(function() { - $(this).hide(); + $("#change_location").click(function() { + $(this).hide(); - log_event("profile", {"type":"location_show", "old":$("#location_sub").text()}); + log_event("profile", {"type":"location_show", "old":$("#location_sub").text()}); - if(loc) { - $("#description").html('
'+ - "Preferred format is city, state, country (so for us, "+ - ""Cambridge, Massachusetts, USA"), but give "+ - "as much or as little detail as you want.
"); + if(loc) { + $("#description").html('
'+ + "Preferred format is city, state, country (so for us, "+ + ""Cambridge, Massachusetts, USA"), but give "+ + "as much or as little detail as you want.
"); - loc=false; + loc=false; - $("#location_sub").html('
'+''+ - ''+'
'); + $("#location_sub").html('
'+''+ + ''+'
'); - $("#change_loc_button").click(function() { - $("#change_location").show(); + $("#change_loc_button").click(function() { + $("#change_location").show(); - postJSON('/change_setting', {'location':$("#id_loc_text").attr("value")}, function(json) { - $("#location_sub").text(json.location); - loc=true; - $("#description").html(""); - log_event("profile", {"type":"location_change", "new":json.location}); - }); - }); - } - }); - - $('#change_password').click(function(){ - $('.modal').trigger('click'); - log_event("profile", {"type":"password_show"}); - }); - - $('#pwd_reset_button').click(function() { - $.postWithPrefix('/password_reset/',{ "csrfmiddlewaretoken" : "${ csrf }", - "email" : $('#id_email').val()}, function(data){ - $("#password_reset_complete_link").click(); - log_event("profile", {"type":"password_send"}); - }); + postJSON('/change_setting', {'location':$("#id_loc_text").attr("value")}, function(json) { + $("#location_sub").text(json.location); + loc=true; + $("#description").html(""); + log_event("profile", {"type":"location_change", "new":json.location}); + }); + }); + } }); - - $("#change_email_form").submit(function(){ - var new_email = $('#new_email_field').val(); - var new_password = $('#new_email_password').val(); - - postJSON('/change_email',{"new_email":new_email, - "password":new_password}, - function(data){ - if(data.success){ - $("#change_email").html("

Please verify your new email

You'll receive a confirmation in your in-box. Please click the link in the email to confirm the email change.

"); - } else { - $("#change_email_error").html(data.error); - } - }); - log_event("profile", {"type":"email_change_request", - "old_email":"${email}", - "new_email":new_email}); - return false; + $('#change_password').click(function(){ + $('.modal').trigger('click'); + log_event("profile", {"type":"password_show"}); }); - $("#change_name_form").submit(function(){ - var new_name = $('#new_name_field').val(); - var rationale = $('#name_rationale_field').val(); - - postJSON('/change_name',{"new_name":new_name, - "rationale":rationale}, - function(data){ - if(data.success){ - $("#apply_name_change").html("

Your request has been submitted.

We'll send you an e-mail when approve the change or need further information. Please allow for up to a week for us to process your request.

"); - } else { - $("#change_name_error").html(data.error); - } - }); - log_event("profile", {"type":"name_change_request", - "new_name":new_name, - "rationale":rationale}); - return false; + $('#pwd_reset_button').click(function() { + $.postWithPrefix('/password_reset/',{ "csrfmiddlewaretoken" : "${ csrf }", + "email" : $('#id_email').val()}, function(data){ + $("#password_reset_complete_link").click(); + log_event("profile", {"type":"password_send"}); }); + }); + + + $("#change_email_form").submit(function(){ + var new_email = $('#new_email_field').val(); + var new_password = $('#new_email_password').val(); + + postJSON('/change_email',{"new_email":new_email, + "password":new_password}, + function(data){ + if(data.success){ + $("#change_email").html("

Please verify your new email

You'll receive a confirmation in your in-box. Please click the link in the email to confirm the email change.

"); + } else { + $("#change_email_error").html(data.error); + } + }); + log_event("profile", {"type":"email_change_request", + "old_email":"${email}", + "new_email":new_email}); + return false; + }); + + $("#change_name_form").submit(function(){ + var new_name = $('#new_name_field').val(); + var rationale = $('#name_rationale_field').val(); + + postJSON('/change_name',{"new_name":new_name, + "rationale":rationale}, + function(data){ + if(data.success){ + $("#apply_name_change").html("

Your request has been submitted.

We'll send you an e-mail when approve the change or need further information. Please allow for up to a week for us to process your request.

"); + } else { + $("#change_name_error").html(data.error); + } + }); + log_event("profile", {"type":"name_change_request", + "new_name":new_name, + "rationale":rationale}); + return false; + }); }); - <%include file="course_navigation.html" args="active_page='profile'" />
@@ -150,7 +149,6 @@ $(function() { %endif

- %if len(section['scores']) > 0:

${ "Problem Scores: " if section['graded'] else "Practice Scores: "}

@@ -210,7 +208,7 @@ $(function() {
-
+ -
-

Apply to change your name

-
-
-
-

To uphold the credibility of edX certificates, name changes must go through an approval process. A member of the course staff will review your request, and if approved, update your information. Please allow up to a week for your request to be processed. Thank you.

-
    -
  • - - -
    • -
  • - - -
    • -
  • - -
    • -
-
-
+ -
-

Change e-mail

+ -
  • - - -
    • -
  • -

    We will send a confirmation to both ${email} and your new e-mail as part of the process.

    - -
    • - + -
    -

    Deactivate edX Account

    -

    Once you deactivate you’re MITx account you will no longer recieve updates and new class announcements from MITx.

    -

    If you’d like to still get updates and new class announcements you can just unenroll and keep your account active.

    + diff --git a/lms/templates/simplewiki/simplewiki_edit.html b/lms/templates/simplewiki/simplewiki_edit.html index 7618dd629c..856dfb9cc8 100644 --- a/lms/templates/simplewiki/simplewiki_edit.html +++ b/lms/templates/simplewiki/simplewiki_edit.html @@ -65,12 +65,10 @@ ${"Edit " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002
    ${wiki_form} %if create_article: - + %else: - %endif - <%include file="simplewiki_instructions.html"/> diff --git a/lms/templates/simplewiki/simplewiki_searchresults.html b/lms/templates/simplewiki/simplewiki_searchresults.html index d94cbf9c25..e64a01ae62 100644 --- a/lms/templates/simplewiki/simplewiki_searchresults.html +++ b/lms/templates/simplewiki/simplewiki_searchresults.html @@ -26,7 +26,7 @@ Displaying all articles

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

    • %endfor -%if not wiki_search_results: +%if not wiki_search_results: No articles matching ${wiki_search_query if wiki_search_query is not UNDEFINED else ""} ! %endif