From c2ae8c4184d2c084a63cdee243e8561659daf0b8 Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Thu, 8 Mar 2012 17:02:02 -0500 Subject: [PATCH 1/6] Added styling for answers with accepted answer and unanswered questions --- sass/discussion/_question-view.scss | 2 ++ sass/discussion/_questions.scss | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/sass/discussion/_question-view.scss b/sass/discussion/_question-view.scss index 99f8ccce9c..c644132d92 100644 --- a/sass/discussion/_question-view.scss +++ b/sass/discussion/_question-view.scss @@ -83,6 +83,8 @@ div.question-header { &.question-delete { color: $mit-red; + text-decoration: none; + cursor: pointer; } } diff --git a/sass/discussion/_questions.scss b/sass/discussion/_questions.scss index 17fc2056dc..3a7ab2f7c1 100644 --- a/sass/discussion/_questions.scss +++ b/sass/discussion/_questions.scss @@ -198,6 +198,22 @@ ul.question-list, div#question-list { } &.answers { + &.accepted { + + @include linear-gradient(#fff, lighten( #c4dfbe, 12% )); + border-color: #c4dfbe; + + span, div { + color: darken(#c4dfbe, 35%); + } + } + &.no-answers { + + + span, div { + color: lighten($mit-red, 20%); + } + } } &.votes { From 7b1f07498dceaed8764b3112525d14ba4d48183d Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Fri, 9 Mar 2012 17:08:11 -0500 Subject: [PATCH 2/6] Page numbers corrected --- book_toc.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/book_toc.html b/book_toc.html index 35ef650b21..ed4794da65 100644 --- a/book_toc.html +++ b/book_toc.html @@ -45,8 +45,8 @@
  • 2.3.4.3 Current Dividers 80
  • 2.3.4.4 Resistors in Parallel 82
  • 2.3.5 A More Complex Circuit 84 -
  • 2.4 Intuitive Method of Circuit Analysis 107 -
  • 2.5 More Examples 108 +
  • 2.4 Intuitive Method of Circuit Analysis 89 +
  • 2.5 More Examples 95
  • 2.6 Dependent Sources and the Control Concept 98
  • 2.7 A Formulation Suitable for a Computer Solution * 107 From c1d80eb3696a035e427a4892b59aa12ba86b36dc Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Fri, 9 Mar 2012 17:37:47 -0500 Subject: [PATCH 3/6] Feedback form includes email and browser --- feedback_email.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/feedback_email.txt b/feedback_email.txt index fce463ff58..426b6855ed 100644 --- a/feedback_email.txt +++ b/feedback_email.txt @@ -1,4 +1,6 @@ Feedback from: ${ user } +E-mail: ${ email } +Browser: ${ browser } url: ${ url } time: ${ time } Subject: ${ subject } From 103b76429908df455b1980d071459a6b3ffffb0b Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Fri, 9 Mar 2012 20:50:20 -0500 Subject: [PATCH 4/6] Textbook remembers last page --- staticbook.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/staticbook.html b/staticbook.html index dcde36559c..328507c76e 100644 --- a/staticbook.html +++ b/staticbook.html @@ -5,6 +5,12 @@ var page=${ page }; $(document).ready(function(){ + if(!page) { + cookie_page = $.cookie("book_page"); + if(cookie_page) { + goto_page(cookie_page); + } + } $("#booknav").treeview({collapsed:true, unique:true/*, cookieId: "treeview-book-nav", persist: "cookie"*/}); }); @@ -19,6 +25,7 @@ function goto_page(n) { prefix="00"; } $("#bookpage").attr("src","${ settings.BOOK_URL }p"+prefix+n+".png"); + $.cookie("book_page", n, {'expires':3650, 'path':'/'}); }; function prev_page() { From e2995a9e60d8a8ee5078b9faeb95ae1fa2eaf9e9 Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Sat, 10 Mar 2012 22:31:58 -0500 Subject: [PATCH 5/6] Basic gradebook --- gradebook.html | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 gradebook.html diff --git a/gradebook.html b/gradebook.html new file mode 100644 index 0000000000..e237fbe16a --- /dev/null +++ b/gradebook.html @@ -0,0 +1,15 @@ + +% for s in students: +

    ${s['username']}

    +% for c in s['grade_info']['grade_summary']: +

    ${c['category']}

    +

    +% if 'subscores' in c: + % for ss in c['subscores']: +
    ${ss['summary']} + % endfor +% endif +

    +% endfor +% endfor +
    From 7812b4a2c48fc9b1b769147163fe2f09906446c2 Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Sun, 11 Mar 2012 16:50:14 -0400 Subject: [PATCH 6/6] Added pi --- main.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.html b/main.html index 89ee65876f..8d05aa2b20 100644 --- a/main.html +++ b/main.html @@ -87,7 +87,7 @@
    Functions:
    sin, cos, tan, sqrt, log10, log2, ln, arccos, arcsin, arctan, abs
    Constants
    -
    e
    +
    e, pi