From 6d8f2a4ae0e008ed885efded681e5dd56e869719 Mon Sep 17 00:00:00 2001 From: Sylvia Pearce Date: Wed, 19 Nov 2014 15:04:17 -0500 Subject: [PATCH] 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")}:

  • - - - + + + - + +

    3.14, .98

    - - + - - + - + - - - - - - - - - - - - - + - + + + + + + + + + + + + + - +

    ${_("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