Skip to content

E
edx-platform
Commit a9daaff1 by Brian Talbot
Options

LMS: revising semantic markup of calculator tooltip content

parent 6d8f2a4a
Showing with 69 additions and 64 deletions
lms/templates/courseware/courseware.html
...@@ -228,8 +228,9 @@ ${fragment.foot_html()} ...@@ -228,8 +228,9 @@ ${fragment.foot_html()}
% endif % endif
% if course.show_calculator: % if course.show_calculator:
<div class="calc-main"> <div class="calc-main">
<a title="${_('Open Calculator')}" href="#" role="button" aria-controls="calculator_wrapper" aria-expanded="false" class="calc">${_("Open Calculator")}</a> <a title="${_('Open Calculator')}" href="#" role="button" aria-controls="calculator_wrapper" aria-expanded="false" class="calc">${_("Open Calculator")}</a>
<div id="calculator_wrapper"> <div id="calculator_wrapper">
<form id="calculator"> <form id="calculator">
<div class="input-wrapper"> <div class="input-wrapper">
...@@ -237,9 +238,14 @@ ${fragment.foot_html()} ...@@ -237,9 +238,14 @@ ${fragment.foot_html()}
<div class="help-wrapper"> <div class="help-wrapper">
<p class="sr" id="hint-instructions">${_('Use the arrow keys to navigate the tips or use the tab key to return to the calculator')}</p> <p class="sr" id="hint-instructions">${_('Use the arrow keys to navigate the tips or use the tab key to return to the calculator')}</p>
<a id="calculator_hint" href="#" role="button" aria-haspopup="true" tabindex="-1" aria-describedby="hint-instructions">${_("Hints")}</a> <a id="calculator_hint" href="#" role="button" aria-haspopup="true" tabindex="-1" aria-describedby="hint-instructions">${_("Hints")}</a>
<ul id="calculator_input_help" class="help" aria-activedescendant="hint-moreinfo" role="tooltip" aria-hidden="true"> <ul id="calculator_input_help" class="help" aria-activedescendant="hint-moreinfo" role="tooltip" aria-hidden="true">
<li class="hint-item" id="hint-moreinfo" tabindex="-1"><p><span class="bold">${_("For detailed information, see <a href='http://edx-guide-for-students.readthedocs.org/en/latest/SFD_mathformatting.html'>Entering Mathematical and Scientific Expressions</a> in the <a href='http://edx-guide-for-students.readthedocs.org/en/latest/index.html'>edX Guide for Students</a>.")}</span></p></li> <li class="hint-item" id="hint-moreinfo" tabindex="-1">
<p><span class="bold">${_("For detailed information, see <a href='http://edx-guide-for-students.readthedocs.org/en/latest/SFD_mathformatting.html'>Entering Mathematical and Scientific Expressions</a> in the <a href='http://edx-guide-for-students.readthedocs.org/en/latest/index.html'>edX Guide for Students</a>.")}</span></p>
</li>
<li class="hint-item" id="hint-tips" tabindex="-1"><p><span class="bold">${_("Tips")}:</span> </p> <li class="hint-item" id="hint-tips" tabindex="-1"><p><span class="bold">${_("Tips")}:</span> </p>
<ul> <ul>
<li class="hint-item" id="hint-paren" tabindex="-1"><p>Use parentheses () to make expressions clear. You can use parentheses inside other parentheses.</p></li> <li class="hint-item" id="hint-paren" tabindex="-1"><p>Use parentheses () to make expressions clear. You can use parentheses inside other parentheses.</p></li>
...@@ -249,98 +255,97 @@ ${fragment.foot_html()} ...@@ -249,98 +255,97 @@ ${fragment.foot_html()}
<li class="hint-item" id="hint-howto-functions" tabindex="-1"><p>For functions, type the name of the function, then the expression in parentheses.</p></li> <li class="hint-item" id="hint-howto-functions" tabindex="-1"><p>For functions, type the name of the function, then the expression in parentheses.</p></li>
</ul> </ul>
</li> </li>
<li class="hint-item" id="hint-list" tabindex="-1"><p></p>
<table border="1"> <li class="hint-item" id="hint-list" tabindex="-1">
<table class="calculator-input-help-table">
<tbody> <tbody>
<tr> <tr>
<td valign="top"><p><span class="bold">${_("To Use")}</span></p></td> <th scope="col">${_("To Use")}</th>
<td valign="top"><p><span class="bold">${_("Type")}</span></p></td> <th scope="col">${_("Type")}</th>
<td valign="top"><p><span class="bold">${_("Examples")}</span></p></td> <th scope="col">${_("Examples")}</th>
</tr> </tr>
<tr> <tr>
<td valign="top"><p><span class="bold">${_("Numbers")}</span></p></td> <th scope="row">${_("Numbers")}</th>
<td valign="top"><p>Integers</p> <td>Integers<br />
<p>Fractions</p> Fractions<br />
<p>Decimals</p></td> Decimals
<td valign="top"><p>2520</p> </td>
<p>2/3</p> <td>2520<br />
<p>3.14, .98</p></td> 2/3<br />
3.14, .98
</td>
</tr> </tr>
<tr> <tr>
<td valign="top"><p><span class="bold">${_("Operators")}</span></p></td> <th scope="row">${_("Operators")}</th>
<td valign="top"><p>+ - * / (add, subtract, multiply, divide)</p> <td>+ - * / (add, subtract, multiply, divide)<br />
<p>^ (raise to a power)</p> ^ (raise to a power)<br />
<p>_ (add a subscript)</p> _ (add a subscript)<br />
<p>|| (parallel resistors)</p></td> || (parallel resistors)
<td valign="top"><p>x+(2*y)/x-1</p> </td>
<p>x^(n+1)</p> <td>x+(2*y)/x-1
<p>v_IN+v_OUT</p> x^(n+1)<br />
<p>1||2</p></td> v_IN+v_OUT<br />
1||2
</td>
</tr> </tr>
<tr> <tr>
<td valign="top"><p><span class="bold">${_("Greek letters")}</span></p></td> <th scope="row">${_("Greek letters")}</th>
<td valign="top"><p>Name of letter</p></td> <td>Name of letter</td>
<td valign="top"><p>alpha</p> <td>alpha<br />
<p>lambda</p></td> lambda
</td>
</tr> </tr>
<tr> <tr>
<td valign="top"><p><span class="bold">${_("Constants")}</span></p></td> <th scope="row">${_("Constants")}</th>
<td valign="top"><p>c, e, g, i, j, k, pi, q, T</p></td> <td>c, e, g, i, j, k, pi, q, T</td>
<td valign="top"><p>20*c</p> <td>20*c<br />
<p>418*T</p></td> 418*T
</td>
</tr> </tr>
<tr> <tr>
<td valign="top"><p><span class="bold">${_("Affixes")}</span></p></td> <th scope="row">${_("Affixes")}</th>
<td valign="top"><p>Percent sign (%) and metric affixes (d, c, m, u, n, p, k, M, G, T)</p></td> <td>Percent sign (%) and metric affixes (d, c, m, u, n, p, k, M, G, T)</td>
<td valign="top"><p>20%</p> <td>20%<br />
<p>20c</p> 20c<br />
<p>418T</p></td> 418T
</td>
</tr> </tr>
<tr> <tr>
<td valign="top"><p><span class="bold">${_("Basic functions")}</span></p></td> <th scope="row">${_("Basic functions")}</th>
<td valign="top"><p>abs, exp, fact or factorial, ln, log2, log10, sqrt</p></td> <td>abs, exp, fact or factorial, ln, log2, log10, sqrt</td>
<td valign="top"><p>abs(x+y)</p> <td>abs(x+y)<br />
<p>sqrt(x^2-y)</p></td> sqrt(x^2-y)
</td>
</tr> </tr>
<tr> <tr>
<td valign="top"><p><span class="bold">${_("Trigonometric functions")}</span></p></td> <th scope="row">${_("Trigonometric functions")}</th>
<td valign="top"><p>sin, cos, tan, sec, csc, cot </p> <td>sin, cos, tan, sec, csc, cot<br />
<p>arcsin, sinh, arcsinh, etc.</p></td> arcsin, sinh, arcsinh, etc.<br />
<td valign="top"><p>sin(4x+y)</p> >sin(4x+y)<br />
<p>arccsch(4x+y)</p></td> arccsch(4x+y)
</td>
<td></td>
</tr> </tr>
<tr> <tr>
<td valign="top"><p><span class="bold">${_("Scientific notation")}</span></p></td> <th scope="row">${_("Scientific notation")}</th>
<td valign="top"><p>10^ and the exponent</p></td> <td>10^ and the exponent</td>
<td valign="top"><p>10^-9</p></td> <td>10^-9</td>
</tr> </tr>
<tr> <tr>
<td valign="top"><p><span class="bold">${_("e notation")}</span></p></td> <th scope="row">${_("e notation")}</th>
<td valign="top"><p>1e and the exponent</p></td> <td>1e and the exponent</td>
<td valign="top"><p>1e-9</p></td> <td>1e-9</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</li> </li>
</ul> </ul>
</div> </div>
</div> </div>
<input id="calculator_button" type="submit" title="${_('Calculate')}" value="=" aria-label="${_('Calculate')}" value="=" tabindex="-1" /> <input id="calculator_button" type="submit" title="${_('Calculate')}" value="=" aria-label="${_('Calculate')}" value="=" tabindex="-1" />
<input type="text" id="calculator_output" title="${_('Calculator Output Field')}" readonly tabindex="-1" /> <input type="text" id="calculator_output" title="${_('Calculator Output Field')}" readonly tabindex="-1" />
</form> </form>
</div> </div>
</div> </div>
......
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