Skip to content

E
edx-platform
Commit a1f63047 by Bridger Maxwell
Options

Merged in default branch. Gradebook is now graphs with standard header/footer 

--HG--
branch : bridger-grades
parents 3be5423b e09310e9
Showing with 108 additions and 77 deletions
404.html
<%inherit file="main.html" />
<section class="activation">
<section class="outside-app">
<h1>Page not found</h1>
<p>The page that you were looking for was not found. Go back to the <a href="/">homepage</a> or let us know about any pages that may have been moved at <a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a>.</p>
</section>
gradebook.html
<<<<<<< local
<%inherit file="main.html" />
<%namespace name="profile_graphs" file="profile_graphs.js"/>
<html>
<head>
<script type="text/javascript" src="${ settings.LIB_URL }jquery-1.6.2.min.js"></script>
<script type="text/javascript" src="${ settings.LIB_URL }jquery-ui-1.8.16.custom.min.js"></script>
<script type="text/javascript" src="/static/js/flot/jquery.flot.js"></script>
<script type="text/javascript" src="/static/js/flot/jquery.flot.stack.js"></script>
<script type="text/javascript" src="/static/js/flot/jquery.flot.symbol.js"></script>
<%block name="headextra">
<script type="text/javascript" src="/static/js/flot/jquery.flot.js"></script>
<script type="text/javascript" src="/static/js/flot/jquery.flot.stack.js"></script>
<script type="text/javascript" src="/static/js/flot/jquery.flot.symbol.js"></script>
% for s in students:
<script>
% for s in students:
<script>
${profile_graphs.body(s['grade_info']['grade_summary'], "grade-detail-graph-" + str(s['id']))}
</script>
%endfor
</head>
<body>
% for s in students:
<h1><a href=/profile/${s['id']}>${s['username']}</a></h1>
<div id="grade-detail-graph-${s['id']}" style="width:1000;height:300;"></div>
</script>
%endfor
</%block>
<!---
% for c in s['grade_info']['grade_summary']:
<h2>${c['category']} </h2>
<p>
% if 'subscores' in c:
% for ss in c['subscores']:
<br>${ss['summary']}
<%include file="navigation.html" args="active_page=''" />
<section class="main-content">
<div class="gradebook-wrapper">
<section class="gradebook-content">
% for s in students:
<h2><a href=/profile/${s['id']}>${s['username']}</a></h2>
<div id="grade-detail-graph-${s['id']}" style="width:1000px;height:300px;"></div>
% endfor
% endif
</p>
% endfor
-->
% endfor
</body>
</html>
</section>
</div>
</section>
\ No newline at end of file
login.html
......@@ -4,7 +4,7 @@
<h1>Log in to MITx</h1>
<p class="no-account">If you don&rsquo;t have an account yet, <a href="#enroll" rel="leanModal">please enroll here</a></p>
</header>
<!--[if lte IE 8]>
<!--[if lte IE 9]>
<p class="ie-warning">You are using a browser that is not supported by <em>MITx</em>, and you might not be able to complete pieces of the course. Please download the latest version of <a href="http://www.mozilla.org/en-US/firefox/new/">Firefox</a> or <a href="https://www.google.com/chrome">Chrome</a> to get the full experience.</p>
<![endif]-->
......
main.html
......@@ -27,7 +27,7 @@
</head>
<body class="<%block name="bodyclass"/>">
<!--[if lte IE 8]>
<!--[if lte IE 9]>
<p class="ie-warning">You are using a browser that is not supported by <em>MITx</em>, and you might not be able to complete pieces of the course. Please download the latest version of <a href="http://www.mozilla.org/en-US/firefox/new/">Firefox</a> or <a href="https://www.google.com/chrome">Chrome</a> to get the full experience.</p>
<![endif]-->
......@@ -87,7 +87,7 @@
<dt>Functions:</dt>
<dd>sin, cos, tan, sqrt, log10, log2, ln, arccos, arcsin, arctan, abs </dd>
<dt>Constants</dt>
<dd>e</dd>
<dd>e, pi</dd>
<!-- Students won't know what parallel means at this time. Complex numbers aren't well tested in the courseware, so we would prefer to not expose them. If you read the comments in the source, feel free to use them. If you run into a bug, please let us know. But we can't officially support them right now.
......
registration/password_reset_confirm.html
<!DOCTYPE html>
<html>
<head>
<title>Reset password - MITx 6.002x</title>
<link rel="stylesheet" href="/static/css/application.css" type="text/css" media="all" />
<!--[if lt IE 9]>
<script src="/static/js/html5shiv.js"></script>
<![endif]-->
</head>
<body>
{% block content %}
<section class="outside-app">
{% if validlink %}
......@@ -22,4 +38,8 @@
{% endif %}
</section>
{% endblock %}
</body>
</html>
sass/_gradebook.scss 0 → 100644
div.gradebook-wrapper {
@extend .table-wrapper;
section.gradebook-content {
@extend .content;
h1 {
@extend .top-header;
}
}
}
sass/_info.scss
......@@ -12,15 +12,22 @@ div.info-wrapper {
margin-bottom: lh();
}
ol {
> ol {
list-style: none;
li {
> li {
padding-bottom: lh(.5);
margin-bottom: lh(.5);
@extend .clearfix;
border-bottom: 1px solid #e3e3e3;
&:first-child {
padding: lh(.5);
margin-left: (-(lh(.5)));
background: $cream;
border-bottom: 1px solid darken($cream, 10%);
}
h2 {
float: left;
width: flex-grid(2, 9);
......
sass/application.scss
......@@ -11,6 +11,7 @@
@import "textbook";
@import "info";
@import "profile";
@import "gradebook";
@import "wiki/basic-html", "wiki/sidebar", "wiki/create", "wiki/wiki", "wiki/table";
@import "help";
......
sass/base/_extends.scss
......@@ -166,8 +166,8 @@ h1.top-header {
.topbar {
@extend .clearfix;
background: #F6EFD4;
border-bottom: 1px solid darken(#F6EFD4, 10%);
background: $cream;
border-bottom: 1px solid darken($cream, 10%);
@include box-shadow(inset 0 1px 0 #fff, inset 1px 0 0 #fff);
font-size: 12px;
margin: (-$body-line-height) (-$body-line-height) $body-line-height;
......@@ -180,17 +180,17 @@ h1.top-header {
}
a {
color: darken(#F6EFD4, 80%);
color: darken($cream, 80%);
&:hover {
color: darken(#F6EFD4, 60%);
color: darken($cream, 60%);
text-decoration: none;
}
&.block-link {
background: darken(#F6EFD4, 5%);
border-left: 1px solid darken(#f6efd4, 20%);
@include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%));
background: darken($cream, 5%);
border-left: 1px solid darken($cream, 20%);
@include box-shadow(inset 1px 0 0 lighten($cream, 5%));
display: block;
text-transform: uppercase;
......
sass/base/_variables.scss
......@@ -26,6 +26,7 @@ $fg-min-width: 810px;
$light-gray: #ddd;
$dark-gray: #333;
$mit-red: #993333;
$cream: #F6EFD4;
$text-color: $dark-gray;
$border-color: $light-gray;
sass/courseware/_sequence-nav.scss
......@@ -19,7 +19,7 @@ nav.sequence-nav {
background-repeat: no-repeat;
&:hover {
background-color: lighten(#F6EFD4, 3%);
background-color: lighten($cream, 3%);
}
}
......@@ -29,13 +29,12 @@ nav.sequence-nav {
@include box-shadow(inset 0 0 3px darken(#dccda2, 10%));
&:hover {
background-color: #F6EFD4;
background-color: $cream;
background-position: center center;
}
}
.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;
......@@ -50,7 +49,7 @@ nav.sequence-nav {
@include box-shadow(1px 0 0 #fff);
background-position: center center;
border: none;
border-right: 1px solid darken(#F6EFD4, 10%);
border-right: 1px solid darken($cream, 10%);
cursor: pointer;
padding: 15px 4px 14px;
width: 28px;
......@@ -166,11 +165,8 @@ nav.sequence-nav {
&.prev, &.next {
a {
// color: darken(#F6EFD4, 80%);
// letter-spacing: 1px;
// text-transform: uppercase;
@include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%));
background-color: darken(#F6EFD4, 5%);
background-color: darken($cream, 5%);
background-position: center center;
background-repeat: no-repeat;
border-left: 1px solid darken(#f6efd4, 20%);
......@@ -182,7 +178,7 @@ nav.sequence-nav {
&:hover {
text-decoration: none;
color: darken(#F6EFD4, 60%);
color: darken($cream, 60%);
text-decoration: none;
background-color: none;
}
......@@ -230,7 +226,7 @@ section.course-content {
margin: lh() auto 0;
overflow: hidden;
width: 106px;
background-color: darken(#F6EFD4, 5%);
background-color: darken($cream, 5%);
@include box-shadow(inset 0 0 0 1px lighten(#f6efd4, 5%));
li {
......@@ -249,15 +245,15 @@ section.course-content {
&:hover {
text-decoration: none;
color: darken(#F6EFD4, 60%);
color: darken($cream, 60%);
text-decoration: none;
opacity: .5;
background-color: darken(#F6EFD4, 10%);
background-color: darken($cream, 10%);
}
&.disabled {
opacity: .4;
background-color: lighten(#F6EFD4, 10%);
background-color: lighten($cream, 10%);
}
}
}
......
sass/discussion/_answers.scss
......@@ -153,12 +153,6 @@ div.answer-actions {
&.question-delete {
// color: $mit-red;
}
&.question-edit, &.permant-link {
// color: darken(#F6EFD4, 45%);;
}
}
}
sass/discussion/_forms.scss
......@@ -128,9 +128,8 @@ form.question-form {
input[type="checkbox"] {
margin-top: 10px;
}
}
div#question-list {
div#question-list {
background-color: rgba(255,255,255,0.95);
@include box-sizing(border-box);
margin-top: -15px;
......@@ -157,3 +156,6 @@ div#question-list {
}
}
}
}
sass/discussion/_profile.scss
......@@ -70,7 +70,7 @@ body.user-profile-page {
margin-bottom: 30px;
li {
background-color: lighten(#F6EFD4, 3%);
background-color: lighten($cream, 3%);
background-position: 10px center;
background-repeat: no-repeat;
@include border-radius(4px);
......
sass/discussion/_question-view.scss
......@@ -19,8 +19,8 @@ div.question-header {
&.post-vote {
@include border-radius(4px);
background-color: lighten(#F6EFD4, 5%);
border: 1px solid darken( #F6EFD4,10% );
background-color: lighten($cream, 5%);
border: 1px solid darken( $cream, 10% );
@include box-shadow(inset 0 1px 0px #fff);
}
......@@ -79,7 +79,6 @@ div.question-header {
width: flex-grid(4,8);
a {
// color: darken(#F6EFD4, 50%);
&.question-delete {
color: $mit-red;
......@@ -134,7 +133,7 @@ div.question-header {
&.revision {
text-align: center;
background:lighten(#F6EFD4, 7%);
background:lighten($cream, 7%);
a {
color: black;
......
sass/layout/_layout.scss
......@@ -29,5 +29,15 @@ html {
margin-top: lh(.5);
}
}
section.outside-app {
@extend .main-content;
max-width: 600px;
padding: lh();
#{$all-text-inputs} {
display: block;
}
}
}
}
sass/wiki/_wiki.scss
......@@ -25,7 +25,7 @@ div.wiki-wrapper {
p {
float: left;
margin-bottom: 0;
color: darken(#F6EFD4, 55%);
color: darken($cream, 55%);
line-height: 46px;
padding-left: lh();
}
......@@ -39,14 +39,14 @@ div.wiki-wrapper {
input[type="button"] {
@extend .block-link;
background-color: darken(#F6EFD4, 5%);
background-color: darken($cream, 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%);
color: darken($cream, 80%);
display: block;
font-weight: normal;
font-size: 12px;
......
server-down.html
<%inherit file="main.html" />
<section class="activation">
<section class="outside-app">
<h1>Currently the <em>MITx</em> servers are down</h1>
<p>Our staff is currently working to get the site back up as soon as possible. Please email us at <a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a> to report any problems or downtime.</p>
</section>
server-error.html
<%inherit file="main.html" />
<section class="activation">
<section class="outside-app">
<h1>There has been an error on the <em>MITx</em> servers</h1>
<p>Our staff is currently working to get the site back up as soon as possible. Please email us at <a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a> to report any problems or downtime.</p>
</section>
server-overloaded.html
<%inherit file="main.html" />
<section class="activation">
<section class="outside-app">
<h1>Currently the <em>MITx</em> servers are overloaded</h1>
<p>Our staff is currently working to get the site back up as soon as possible. Please email us at <a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a> to report any problems or downtime.</p>
</section>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment