From 85a296480654f1f78a304964cba84ae299546cb0 Mon Sep 17 00:00:00 2001 From: Ernie Park Date: Tue, 7 Feb 2012 12:24:30 -0500 Subject: [PATCH 1/3] fix enter on submit for calculator, needs styling --- main.html | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/main.html b/main.html index 704753ca77..ad1d7bd2de 100644 --- a/main.html +++ b/main.html @@ -69,20 +69,22 @@
- - - +
+ + + +
+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. +-->
Suffixes :  %kMGTcmunp
Operations :  ^ * / + - ()
Functions :  sin, cos, tan, sqrt, log10, log2, ln, arccos, arcsin, arctan, abs
Constants :  e
@@ -103,7 +105,8 @@ $(function() { // Calculator $(function() { - $("#calculator_button").click(function(){ + $("form#calculator").submit(function(e){ + e.preventDefault(); $.getJSON("/calculate", {"equation":$("#calculator_input").attr("value")}, function(data){ $("#calculator_output").attr("value",data.result); From f555fc68a43e46df80203b5579df14dbaa3d2abc Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Tue, 7 Feb 2012 13:38:19 -0500 Subject: [PATCH 2/3] Added titles to wiki pages --- simplewiki_base.html | 2 -- simplewiki_create.html | 2 ++ simplewiki_edit.html | 2 ++ simplewiki_error.html | 3 +++ simplewiki_history.html | 2 ++ simplewiki_searchresults.html | 2 ++ simplewiki_view.html | 2 ++ 7 files changed, 13 insertions(+), 2 deletions(-) diff --git a/simplewiki_base.html b/simplewiki_base.html index 731f5be8d9..2770013771 100644 --- a/simplewiki_base.html +++ b/simplewiki_base.html @@ -2,8 +2,6 @@ <%inherit file="main.html"/> -<%block name="title">${"wiki_title"} - <%block name="headextra"> diff --git a/simplewiki_create.html b/simplewiki_create.html index 3d820310f6..65ecbff4aa 100644 --- a/simplewiki_create.html +++ b/simplewiki_create.html @@ -2,6 +2,8 @@ <%inherit file="simplewiki_base.html"/> +<%block name="title">Create Article - MITX 6.002 Wiki + <%block name="wiki_page_title"> Create article diff --git a/simplewiki_edit.html b/simplewiki_edit.html index 7ead7f4abc..30e2c6ecc0 100644 --- a/simplewiki_edit.html +++ b/simplewiki_edit.html @@ -2,6 +2,8 @@ <%inherit file="simplewiki_base.html"/> +<%block name="title">${"Edit " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITX 6.002 Wiki + <%block name="wiki_page_title"> ${ wiki_article.title } diff --git a/simplewiki_error.html b/simplewiki_error.html index 5f9bb0be5c..f4269f1043 100644 --- a/simplewiki_error.html +++ b/simplewiki_error.html @@ -6,6 +6,9 @@ from django.core.urlresolvers import reverse %> +<%block name="title">Oops... - MITX 6.002 Wiki + + <%block name="wiki_page_title"> Oops... diff --git a/simplewiki_history.html b/simplewiki_history.html index 0cdeaf4b30..bea5a02284 100644 --- a/simplewiki_history.html +++ b/simplewiki_history.html @@ -2,6 +2,8 @@ <%inherit file="simplewiki_base.html"/> +<%block name="title">${"Revision history of " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITX 6.002 Wiki + <%! from django.core.urlresolvers import reverse %> diff --git a/simplewiki_searchresults.html b/simplewiki_searchresults.html index 88b70c3b7e..267a1f921b 100644 --- a/simplewiki_searchresults.html +++ b/simplewiki_searchresults.html @@ -2,6 +2,8 @@ <%inherit file="simplewiki_base.html"/> +<%block name="title">Search Results - MITX 6.002 Wiki + <%! from django.core.urlresolvers import reverse %> diff --git a/simplewiki_view.html b/simplewiki_view.html index 6492174670..05243b0bc1 100644 --- a/simplewiki_view.html +++ b/simplewiki_view.html @@ -2,6 +2,8 @@ <%inherit file="simplewiki_base.html"/> +<%block name="title">${wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITX 6.002 Wiki + <%block name="wiki_page_title"> ${ wiki_article.title } ${'- Deleted Revision!' if wiki_current_revision_deleted else ''} From 90e2e0f3e0aaeedb5ebdfe3b3e74b51e3bdea2c8 Mon Sep 17 00:00:00 2001 From: Ernie Park Date: Tue, 7 Feb 2012 15:10:33 -0500 Subject: [PATCH 3/3] make video player use one play/pause button that toggles --- video.html | 3 +-- video_init.js | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/video.html b/video.html index f6106fd671..4f585b4a79 100644 --- a/video.html +++ b/video.html @@ -15,8 +15,7 @@
0:00/0:00
diff --git a/video_init.js b/video_init.js index bf1b4bf5b7..42dddad573 100644 --- a/video_init.js +++ b/video_init.js @@ -34,7 +34,7 @@ loadNewVideo(streams["1.0"], ${ position }); function add_speed(key, stream) { var id = 'speed_' + stream; - $("#video_speeds").append(' '+key+'X'); + $("#video_speeds").append(' '+key+'x'); $("#"+id).click(function(){ change_video_speed(key, stream); }); @@ -57,3 +57,16 @@ l.sort(sort_by_value); for(var i=0; i