From d7d86cddc724b374f4cba25e45515e6c7c91c5cc Mon Sep 17 00:00:00 2001 From: Sylvia Pearce Date: Tue, 18 Nov 2014 13:57:47 -0500 Subject: [PATCH 1/7] Update calculator tooltip --- lms/templates/courseware/courseware.html | 128 +++++------------------ 1 file changed, 24 insertions(+), 104 deletions(-) diff --git a/lms/templates/courseware/courseware.html b/lms/templates/courseware/courseware.html index 4a07bf31da..32e38c5a6d 100644 --- a/lms/templates/courseware/courseware.html +++ b/lms/templates/courseware/courseware.html @@ -228,7 +228,7 @@ ${fragment.foot_html()} % endif % if course.show_calculator: -
+
@@ -238,110 +238,29 @@ ${fragment.foot_html()}

${_('Use the arrow keys to navigate the tips or use the tab key to return to the calculator')}

${_("Hints")} -
@@ -351,5 +270,6 @@ ${fragment.foot_html()}
+ % endif <%include file="../modal/accessible_confirm.html" /> From 1b285be26452e39d2916073a8bdb0e51f3ef74a9 Mon Sep 17 00:00:00 2001 From: Sylvia Pearce Date: Wed, 19 Nov 2014 13:32:49 -0500 Subject: [PATCH 2/7] Second try at a new calculator tooltip --- lms/templates/courseware/courseware.html | 113 +++++++++++++++++++---- 1 file changed, 93 insertions(+), 20 deletions(-) diff --git a/lms/templates/courseware/courseware.html b/lms/templates/courseware/courseware.html index 32e38c5a6d..61f4772456 100644 --- a/lms/templates/courseware/courseware.html +++ b/lms/templates/courseware/courseware.html @@ -238,29 +238,102 @@ ${fragment.foot_html()}

${_('Use the arrow keys to navigate the tips or use the tab key to return to the calculator')}

${_("Hints")} -
From 14e022ca3012342188e58ae833bf9179bdbd1eee Mon Sep 17 00:00:00 2001 From: Sylvia Pearce Date: Wed, 19 Nov 2014 14:17:30 -0500 Subject: [PATCH 3/7] Tweaks to calculator tooltip --- lms/templates/courseware/courseware.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lms/templates/courseware/courseware.html b/lms/templates/courseware/courseware.html index 61f4772456..0e89250b45 100644 --- a/lms/templates/courseware/courseware.html +++ b/lms/templates/courseware/courseware.html @@ -250,13 +250,13 @@ ${fragment.foot_html()}

  • - +
    - - - - + + + + + From 6d8f2a4ae0e008ed885efded681e5dd56e869719 Mon Sep 17 00:00:00 2001 From: Sylvia Pearce Date: Wed, 19 Nov 2014 15:04:17 -0500 Subject: [PATCH 4/7] More tweaks to calculator tooltip --- lms/templates/courseware/courseware.html | 64 ++++++++++++------------ 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/lms/templates/courseware/courseware.html b/lms/templates/courseware/courseware.html index 0e89250b45..51e7397ad4 100644 --- a/lms/templates/courseware/courseware.html +++ b/lms/templates/courseware/courseware.html @@ -242,75 +242,60 @@ ${fragment.foot_html()}

  • ${_("For detailed information, see Entering Mathematical and Scientific Expressions in the edX Guide for Students.")}

  • ${_("Tips")}:

      -

    • Use parentheses () to make expressions clear.

      • +

    • Use parentheses () to make expressions clear. You can use parentheses inside other parentheses.

    • Do not use spaces in expressions.

      • -

    • For functions, type the name of the function, then the expression in parentheses.

    • For constants, indicate multiplication explicitly (example: 5*c).

      • -

    • For metric affixes, type the number and affix without a space (example: 5c).

      • +

    • For affixes, type the number and affix without a space (example: 5c).

      • +

    • For functions, type the name of the function, then the expression in parentheses.

    • -

    To Use

    Type

    Examples

    ${_("To Use")}:

    ${_("Type")}:

    ${_("Examples")}:

    ${_("Numbers")}:

    - - - + + + - + +

    3.14, .98

    - - + - - + - + - - - - - - - - - - - - - + - + + + + + + + + + + + + + - + From a9daaff17be75475890cc3e842ce777f460ec6ea Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Wed, 26 Nov 2014 13:14:24 -0500 Subject: [PATCH 5/7] LMS: revising semantic markup of calculator tooltip content --- lms/templates/courseware/courseware.html | 219 ++++++++++++----------- 1 file changed, 112 insertions(+), 107 deletions(-) diff --git a/lms/templates/courseware/courseware.html b/lms/templates/courseware/courseware.html index 51e7397ad4..72eda341f8 100644 --- a/lms/templates/courseware/courseware.html +++ b/lms/templates/courseware/courseware.html @@ -228,121 +228,126 @@ ${fragment.foot_html()} % endif % if course.show_calculator: -
    - -
    - -
    - +
    + -
    -

    ${_('Use the arrow keys to navigate the tips or use the tab key to return to the calculator')}

    - ${_("Hints")} -

    ${_("To Use")}:

    ${_("Type")}:

    ${_("Examples")}:

    ${_("To Use")}

    ${_("Type")}

    ${_("Examples")}

    ${_("Numbers")}:

    ${_("Numbers")}

    Integers

    Fractions

    Decimals

    2520

    2/3

    -

    3.14

    -

    .98

    ${_("Operators")}:

    + - * /

    +

    ${_("Operators")}

    + - * / (add, subtract, multiply, divide)

    ^ (raise to a power)

    _ (add a subscript)

    || (parallel resistors)

    x^(n+1)

    +

    x+(2*y)/x-1

    +

    x^(n+1)

    v_IN+v_OUT

    1||2

    ${_("Greek letters")}:

    ${_("Greek letters")}

    Name of letter

    alpha

    lambda

    ${_("Constants")}:

    ${_("Constants")}

    c, e, g, i, j, k, pi, q, T

    20*c

    418*T

    ${_("Basic functions")}:

    abs, exp, fact or factorial, ln, log2, log10, sqrt

    abs(x+y)

    -

    sqrt(x^2-y)

    ${_("Trigonometric functions")}:

    sin, cos, tan, sec, csc, cot

    -

    arcsin, sinh, arcsinh, etc.

    sin(4x+y)

    -

    arccsch(4x+y)

    ${_("Affixes")}:

    ${_("Affixes")}

    Percent sign (%) and metric affixes (d, c, m, u, n, p, k, M, G, T)

    20%

    20c

    @@ -318,13 +303,28 @@ ${fragment.foot_html()}

    ${_("Scientific notation")}:

    ${_("Basic functions")}

    abs, exp, fact or factorial, ln, log2, log10, sqrt

    abs(x+y)

    +

    sqrt(x^2-y)

    ${_("Trigonometric functions")}

    sin, cos, tan, sec, csc, cot

    +

    arcsin, sinh, arcsinh, etc.

    sin(4x+y)

    +

    arccsch(4x+y)

    ${_("Scientific notation")}

    10^ and the exponent

    10^-9

    ${_("e notation")}:

    ${_("e notation")}

    1e and the exponent

    1e-9
    - - - - - - +
    + +
    + -
    - - - - +
    +

    ${_('Use the arrow keys to navigate the tips or use the tab key to return to the calculator')}

    -
    - - - - + ${_("Hints")} - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    ${_("To Use")}

    ${_("Type")}

    ${_("Examples")}

    ${_("Numbers")}

    Integers

    -

    Fractions

    -

    Decimals

    2520

    -

    2/3

    -

    3.14, .98

    ${_("Operators")}

    + - * / (add, subtract, multiply, divide)

    -

    ^ (raise to a power)

    -

    _ (add a subscript)

    -

    || (parallel resistors)

    x+(2*y)/x-1

    -

    x^(n+1)

    -

    v_IN+v_OUT

    -

    1||2

    ${_("Greek letters")}

    Name of letter

    alpha

    -

    lambda

    ${_("Constants")}

    c, e, g, i, j, k, pi, q, T

    20*c

    -

    418*T

    ${_("Affixes")}

    Percent sign (%) and metric affixes (d, c, m, u, n, p, k, M, G, T)

    20%

    -

    20c

    -

    418T

    ${_("Basic functions")}

    abs, exp, fact or factorial, ln, log2, log10, sqrt

    abs(x+y)

    -

    sqrt(x^2-y)

    ${_("Trigonometric functions")}

    sin, cos, tan, sec, csc, cot

    -

    arcsin, sinh, arcsinh, etc.

    sin(4x+y)

    -

    arccsch(4x+y)

    ${_("Scientific notation")}

    10^ and the exponent

    10^-9

    ${_("e notation")}

    1e and the exponent

    1e-9

    - -
    • - - - - - - - +

  • ${_("Tips")}:

    +
      +

    • Use parentheses () to make expressions clear. You can use parentheses inside other parentheses.

      • +

    • Do not use spaces in expressions.

      • +

    • For constants, indicate multiplication explicitly (example: 5*c).

      • +

    • For affixes, type the number and affix without a space (example: 5c).

      • +

    • For functions, type the name of the function, then the expression in parentheses.

      • +
    +
    • +
  • + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ${_("To Use")}${_("Type")}${_("Examples")}
    ${_("Numbers")}Integers
    + Fractions
    + Decimals +     		2520
    + 2/3
    + 3.14, .98 +
    ${_("Operators")}+ - * / (add, subtract, multiply, divide)
    + ^ (raise to a power)
    + _ (add a subscript)
    + || (parallel resistors) +     		x+(2*y)/x-1 + x^(n+1)
    + v_IN+v_OUT
    + 1||2 +
    ${_("Greek letters")}Name of letteralpha
    + lambda +
    ${_("Constants")}c, e, g, i, j, k, pi, q, T20*c
    + 418*T +
    ${_("Affixes")}Percent sign (%) and metric affixes (d, c, m, u, n, p, k, M, G, T)20%
    + 20c
    + 418T +
    ${_("Basic functions")}abs, exp, fact or factorial, ln, log2, log10, sqrtabs(x+y)
    + sqrt(x^2-y) +
    ${_("Trigonometric functions")}sin, cos, tan, sec, csc, cot
    + arcsin, sinh, arcsinh, etc.
    + >sin(4x+y)
    + arccsch(4x+y) +
    ${_("Scientific notation")}10^ and the exponent10^-9
    ${_("e notation")}1e and the exponent1e-9
    +
    • + + + + + + + % endif <%include file="../modal/accessible_confirm.html" /> From 8d947f021532d7c7c80190ec7202e4efeb86f3e3 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Wed, 3 Dec 2014 16:09:07 -0500 Subject: [PATCH 6/7] LMS: revising styling of calculator tooltip content --- .../sass/course/layout/_calculator.scss | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/lms/static/sass/course/layout/_calculator.scss b/lms/static/sass/course/layout/_calculator.scss index cd767b32f9..c7efbdc167 100644 --- a/lms/static/sass/course/layout/_calculator.scss +++ b/lms/static/sass/course/layout/_calculator.scss @@ -43,6 +43,17 @@ div.calc-main { position: relative; top: -36px; + // UI: input help table + .calculator-input-help-table { + margin: ($baseline/2) 0; + + tr th, tr td { + vertical-align: top; + border: 1px solid $gray-l4; + padding: ($baseline/2); + } + } + form { @extend .clearfix; @include box-sizing(border-box); @@ -153,14 +164,6 @@ div.calc-main { margin: 0; } - table { - margin: 10px 0; - - td, th { - padding: 2px 5px; - } - } - .calc-postfixes { margin: 10px auto; From 3e779a52f3c6fe84965859c0498a713f230e7e70 Mon Sep 17 00:00:00 2001 From: Sylvia Pearce Date: Thu, 4 Dec 2014 11:00:37 -0500 Subject: [PATCH 7/7] Fix minor typo in Trigonometric Functions row --- lms/templates/courseware/courseware.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lms/templates/courseware/courseware.html b/lms/templates/courseware/courseware.html index 72eda341f8..72fa19925a 100644 --- a/lms/templates/courseware/courseware.html +++ b/lms/templates/courseware/courseware.html @@ -321,7 +321,8 @@ ${fragment.foot_html()} ${_("Trigonometric functions")} sin, cos, tan, sec, csc, cot
    arcsin, sinh, arcsinh, etc.
    - >sin(4x+y)
    + + sin(4x+y)
    arccsch(4x+y)