Skip to content

E
edx-platform
Commit bd523c2e by Kyle Fiedler
Options

Merged in with default 

--HG--
branch : kf-login-errors
parents aeb5357e feb383fd
Showing with 183 additions and 68 deletions
main.html
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<%block name="title"><title>MITX 6.002</title></%block> <%block name="title"><title>MITx 6.002</title></%block>
<link rel="stylesheet" href="${ settings.LIB_URL }jquery.treeview.css" type="text/css" media="all" /> <link rel="stylesheet" href="${ settings.LIB_URL }jquery.treeview.css" type="text/css" media="all" />
<link rel="stylesheet" href="/static/css/application.css" type="text/css" media="all" /> <link rel="stylesheet" href="/static/css/application.css" type="text/css" media="all" />
...@@ -71,21 +71,24 @@ ...@@ -71,21 +71,24 @@
<div id="calculator_div" class="leanModal_box"> <div id="calculator_div" class="leanModal_box">
<form id="calculator"> <form id="calculator">
<input type="text" id="calculator_input"> <input type="text" id="calculator_input">
<input id="calculator_button" type="submit" value="=&gt;"> <input id="calculator_button" type="submit" value="=">
<input type="text" id="calculator_output" readonly> <input type="text" id="calculator_output" readonly>
</form> </form>
<table> <tr><td align="right">Suffixes</td><td>&nbsp;:&nbsp;</td><td align="left"> %kMGTcmunp</td></tr> <dl>
<tr><td align="right">Operations</td><td>&nbsp;:&nbsp;</td><td align="left"> ^ * / + - ()</td></tr> <dt>Suffixes:</dt>
<tr><td align="right">Functions</td><td>&nbsp;:&nbsp;</td><td align="left"> sin, cos, tan, sqrt, log10, log2, ln, arccos, arcsin, arctan, abs </td></tr> <dd> %kMGTcmunp</dd>
<tr><td align="right">Constants</td><td>&nbsp;:&nbsp;</td><td align="left"> e</td></tr> <dt>Operations:</dt>
<!--p> Unsupported: ||, j </p <dd>^ * / + - ()</dd>
Students won't know what parallel means at this time. <dt>Functions:</dt>
Complex numbers aren't well tested in the courseware, so we would prefer to not expose them. <dd>sin, cos, tan, sqrt, log10, log2, ln, arccos, arcsin, arctan, abs </dd>
If you read the comments in the source, feel free to use them. If you run into a bug, please <dt>Constants</dt>
let us know. But we can't officially support them right now. <dd>e</dd>
-->
</table> <!-- 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.
<dt>Unsupported:</dt> <dd>||, j </dd> -->
</dl>
</div> </div>
<script> <script>
......
marketing.html
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<%block name="title"><title>MITX 6.002</title></%block> <%block name="title"><title>MITx 6.002</title></%block>
<!--link rel="stylesheet" href="${ settings.LIB_URL }jquery.treeview.css" type="text/css" media="all" /--> <!--link rel="stylesheet" href="${ settings.LIB_URL }jquery.treeview.css" type="text/css" media="all" /-->
<link rel="stylesheet" href="/static/css/marketing.css" type="text/css" media="all" /> <link rel="stylesheet" href="/static/css/marketing.css" type="text/css" media="all" />
......
profile.html
...@@ -72,7 +72,7 @@ $(function() { ...@@ -72,7 +72,7 @@ $(function() {
$('#pwd_reset_button').click(function() { $('#pwd_reset_button').click(function() {
$.post('/password_reset/',{ "csrfmiddlewaretoken" : "${ csrf }", $.post('/password_reset/',{ "csrfmiddlewaretoken" : "${ csrf }",
"email" : $('#id_email').val()}, function(data){ "email" : $('#id_email').val()}, function(data){
$('#pwd_reset').html(data); $("#password_reset_complete_link").click();
log_event("profile", {"type":"password_send"}); log_event("profile", {"type":"password_send"});
}); });
}); });
...@@ -155,9 +155,7 @@ $(function() { ...@@ -155,9 +155,7 @@ $(function() {
<div id="change_password_pop"> <div id="change_password_pop">
<h2>Password change</h2> <h2>Password change</h2>
<p>We'll e-mail you a password reset link at ${email}. Follow <p>We'll e-mail a password reset link to ${email}.</p>
the link in the confirmation email to change your
password.</p>
<input id="id_email" type="hidden" name="email" maxlength="75" value="${email}" /> <input id="id_email" type="hidden" name="email" maxlength="75" value="${email}" />
<input type="submit" id="pwd_reset_button" value="Reset Password" /> <input type="submit" id="pwd_reset_button" value="Reset Password" />
...@@ -167,3 +165,8 @@ $(function() { ...@@ -167,3 +165,8 @@ $(function() {
</div> </div>
</section> </section>
<div id="password_reset_complete" class="leanModal_box">
<a href="#password_reset_complete" rel="leanModal" id="password_reset_complete_link"></a>
<h1>Password Reset Email Sent</h1>
An email has been sent to ${email}. Follow the link in the email to change your password.
</div>
sass/_askbot-original.scss
...@@ -1014,27 +1014,27 @@ ul { ...@@ -1014,27 +1014,27 @@ ul {
font-weight: bold; font-weight: bold;
font-size: 24px; } font-size: 24px; }
#fmask { // #fmask {
margin-bottom: 30px; // margin-bottom: 30px;
width: 100%; } // width: 100%; }
#askFormBar { // #askFormBar {
display: inline-block; // display: inline-block;
padding: 4px 7px 5px 0px; // padding: 4px 7px 5px 0px;
margin-top: 0px; // margin-top: 0px;
p { // p {
margin: 0 0 5px 0; // margin: 0 0 5px 0;
font-size: 14px; // font-size: 14px;
color: #525252; // color: #525252;
line-height: 1.4; } // line-height: 1.4; }
.questionTitleInput { // .questionTitleInput {
font-size: 24px; // font-size: 24px;
line-height: 24px; // line-height: 24px;
height: 36px; // height: 36px;
margin: 0px; // margin: 0px;
padding: 0px 0 0 5px; // padding: 0px 0 0 5px;
border: #cce6ec 3px solid; // border: #cce6ec 3px solid;
width: 725px; } } // width: 725px; } }
.ask-page div#question-list, .edit-question-page div#question-list { .ask-page div#question-list, .edit-question-page div#question-list {
float: none; float: none;
...@@ -1075,12 +1075,12 @@ ul { ...@@ -1075,12 +1075,12 @@ ul {
color: #525252; color: #525252;
font-size: 13px; } font-size: 13px; }
.ask-page #id_tags, .edit-question-page #id_tags { // .ask-page #id_tags, .edit-question-page #id_tags {
border: #cce6ec 3px solid; // border: #cce6ec 3px solid;
height: 25px; // height: 25px;
padding-left: 5px; // padding-left: 5px;
width: 395px; // width: 395px;
font-size: 14px; } // font-size: 14px; }
.title-desc { .title-desc {
color: #707070; color: #707070;
...@@ -1126,8 +1126,8 @@ ul { ...@@ -1126,8 +1126,8 @@ ul {
// margin-bottom: 10px; // margin-bottom: 10px;
// width: 710px; } // width: 710px; }
#id_title { // #id_title {
width: 100%; } // width: 100%; }
// .wmd-preview { // .wmd-preview {
// margin: 3px 0 5px 0; // margin: 3px 0 5px 0;
...@@ -2192,10 +2192,11 @@ ins { ...@@ -2192,10 +2192,11 @@ ins {
span { span {
&.text-counter { &.text-counter {
margin-right: 20px; } margin-right: 20px; }
&.form-error { // &.form-error {
color: #990000; // color: #990000;
font-weight: normal; // font-weight: normal;
margin-left: 5px; } } // margin-left: 5px; }
}
p.form-item { p.form-item {
margin: 0px; } margin: 0px; }
...@@ -2247,11 +2248,11 @@ label.retag-error { ...@@ -2247,11 +2248,11 @@ label.retag-error {
margin-top: 10px; margin-top: 10px;
padding: 10px; } padding: 10px; }
span.form-error { // span.form-error {
color: #990000; // color: #990000;
font-size: 90%; // font-size: 90%;
font-weight: normal; // font-weight: normal;
margin-left: 5px; } // margin-left: 5px; }
.favorites-empty { .favorites-empty {
width: 32px; width: 32px;
......
sass/_discussion-answers.scss
...@@ -54,3 +54,19 @@ div.answer-own { ...@@ -54,3 +54,19 @@ div.answer-own {
padding-left: flex-grid(1.2); padding-left: flex-grid(1.2);
padding-top: 10px; padding-top: 10px;
} }
div.answer-actions {
text-align: right;
margin: 0;
padding: 0;
span.sep {
color: #ddd;
}
a {
text-decoration: none;
}
a.question-edit, a.permant-link {
color: #999;
}
}
sass/_discussion-forms.scss
...@@ -12,8 +12,19 @@ form.answer-form { ...@@ -12,8 +12,19 @@ form.answer-form {
width: 99%; width: 99%;
} }
span.form-error { div.form-item {
display: block; margin: 25px 0;
label {
display: block;
margin-bottom: -5px;
}
}
span.form-error, label.form-error {
color: #990000;
display: inline;
font-size: 90%;
font-weight: bold; font-weight: bold;
padding: 10px 0; padding: 10px 0;
} }
...@@ -50,7 +61,24 @@ form.answer-form { ...@@ -50,7 +61,24 @@ form.answer-form {
} }
} }
} }
input.after-editor { input.after-editor {
margin-bottom: 20px; margin-bottom: 20px;
margin-right: 10px; margin-right: 10px;
} }
form.question-form {
@extend .answer-form;
border: none;
padding: 0;
margin-top: -15px;
input[type="text"] {
width: flex-grid(6);
}
input[type="checkbox"] {
margin-top: 10px;
}
}
sass/_leanmodal.scss
...@@ -18,12 +18,30 @@ div.leanModal_box { ...@@ -18,12 +18,30 @@ div.leanModal_box {
background: #fff; background: #fff;
padding: lh(2); padding: lh(2);
a.modal_close {
position: absolute;
top: 12px;
right: 12px;
display: block;
width: 14px;
height: 14px;
z-index: 2;
color: #aaa;
font-style: normal;
&:hover{
text-decoration: none;
color: $mit-red;
}
}
h1 { h1 {
font-size: 24px; font-size: 24px;
margin-top: 0; margin-top: 0;
padding-bottom: lh(); padding-bottom: lh();
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
margin-bottom: lh(); margin-bottom: lh();
text-align: left;
} }
&#enroll { &#enroll {
...@@ -187,3 +205,52 @@ div#feedback_div{ ...@@ -187,3 +205,52 @@ div#feedback_div{
} }
} }
} }
div#calculator_div {
max-width: 500px;
form {
padding-bottom: lh();
margin-bottom: lh();
border-bottom: 1px solid #ddd;
input#calculator_input {
width: 400px;
}
input#calculator_button {
background: 0;
color: $mit-red;
border: 0;
@include box-shadow(none);
padding: 0;
text-shadow: none;
&:hover {
color: #333;
}
}
input#calculator_output {
border: 0;
background: 0;
padding: lh(.35);
width: 60px;
font-size: 24px;
font-weight: bold;
}
}
dl {
dt {
float: left;
clear: both;
padding-right: lh(.5);
font-weight: bold;
}
dd {
float: left;
}
}
}
simplewiki_base.html
...@@ -102,10 +102,7 @@ ...@@ -102,10 +102,7 @@
<div id="wiki_create_form"> <div id="wiki_create_form">
<% <%
theaction = "this.wiki_article_name.value.replace(/([^a-zA-Z0-9\-])/g, '')" theaction = "this.wiki_article_name.value.replace(/([^a-zA-Z0-9\-])/g, '')"
if (wiki_article is not UNDEFINED): baseURL = reverse("wiki_create", args=["/"])
baseURL = reverse("wiki_create", args=[wiki_article.get_url()])
else:
baseURL = reverse("wiki_create", args=["/"])
%> %>
<form method="GET" onsubmit="this.action='${baseURL + "' + " + theaction};"> <form method="GET" onsubmit="this.action='${baseURL + "' + " + theaction};">
......
simplewiki_create.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<%inherit file="simplewiki_base.html"/> <%inherit file="simplewiki_base.html"/>
<%block name="title"><title>Create Article - MITX 6.002 Wiki</title></%block> <%block name="title"><title>Create Article - MITx 6.002 Wiki</title></%block>
<%block name="wiki_page_title"> <%block name="wiki_page_title">
Create article Create article
......
simplewiki_edit.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<%inherit file="simplewiki_base.html"/> <%inherit file="simplewiki_base.html"/>
<%block name="title"><title>${"Edit " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITX 6.002 Wiki</title></%block> <%block name="title"><title>${"Edit " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki</title></%block>
<%block name="wiki_page_title"> <%block name="wiki_page_title">
${ wiki_article.title } ${ wiki_article.title }
......
simplewiki_error.html
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
%> %>
<%block name="title"><title>Oops... - MITX 6.002 Wiki</title></%block> <%block name="title"><title>Oops... - MITx 6.002 Wiki</title></%block>
<%block name="wiki_page_title"> <%block name="wiki_page_title">
......
simplewiki_history.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<%inherit file="simplewiki_base.html"/> <%inherit file="simplewiki_base.html"/>
<%block name="title"><title>${"Revision history of " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITX 6.002 Wiki</title></%block> <%block name="title"><title>${"Revision history of " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki</title></%block>
<%! <%!
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
......
simplewiki_instructions.html
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<p class="markdown-example">circuit:basic</p> <p class="markdown-example">circuit:basic</p>
<p class="markdown-example"><span>$</span>LaTeX Math Expression<span>$</span></p> <p class="markdown-example"><span>$</span>LaTeX Math Expression<span>$</span></p>
To create a new wiki article, create a link to it. Clicking the link gives you the creation page. To create a new wiki article, create a link to it. Clicking the link gives you the creation page.
<p class="markdown-example">[Article Name](wiki:ArticleName)</p> <p class="markdown-example">[Article Name](/wiki/view/ArticleName)</p>
Other useful examples:<br> Other useful examples:<br>
<p class="markdown-example">[Link](http://google.com)</p> <p class="markdown-example">[Link](http://google.com)</p>
<p class="markdown-example">Huge Header <p class="markdown-example">Huge Header
......
simplewiki_searchresults.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<%inherit file="simplewiki_base.html"/> <%inherit file="simplewiki_base.html"/>
<%block name="title"><title>Search Results - MITX 6.002 Wiki</title></%block> <%block name="title"><title>Search Results - MITx 6.002 Wiki</title></%block>
<%! <%!
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
......
simplewiki_view.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<%inherit file="simplewiki_base.html"/> <%inherit file="simplewiki_base.html"/>
<%block name="title"><title>${wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITX 6.002 Wiki</title></%block> <%block name="title"><title>${wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki</title></%block>
<%block name="wiki_page_title"> <%block name="wiki_page_title">
${ wiki_article.title } ${'<span style="color: red;">- Deleted Revision!</span>' if wiki_current_revision_deleted else ''} ${ wiki_article.title } ${'<span style="color: red;">- Deleted Revision!</span>' if wiki_current_revision_deleted else ''}
......
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