Merge branch 'MDL-30843_b' of git://github.com/rwijaya/moodle

This commit is contained in:
Sam Hemelryk 2012-04-10 12:34:37 +12:00
commit 5bfeb5ffd3
108 changed files with 390 additions and 216 deletions

View file

@ -275,12 +275,12 @@ function slasharguments($texexp, $md5) {
<html>
<head><title>Algebra Filter Debugger</title></head>
<body>
<p>Please enter an algebraic expression <b>without</b> any surrounding @@ into
the text box below. (Click <a href="#help">here for help.</a>)
<p><label for="algebra">Please enter an algebraic expression <b>without</b> any surrounding @@ into
the text box below. (Click <a href="#help">here for help.</a>)</label>
<form action="algebradebug.php" method="get"
target="inlineframe">
<center>
<input type="text" name="algebra" size="50"
<input type="text" id="algebra" name="algebra" size="50"
value="sin(z)/(x^2+y^2)" />
</center>
<ol>

View file

@ -181,7 +181,10 @@ if (empty($availablefilters)) {
} else {
$activechoices[TEXTFILTER_INHERIT] = $strdefaultoff;
}
$row[] = html_writer::select($activechoices, str_replace('/', '_', $filter), $filterinfo->localstate, false);
$filtername = str_replace('/', '_', $filter);
$select = html_writer::label($filterinfo->localstate, 'menu'. $filtername, false, array('class' => 'accesshide'));
$select .= html_writer::select($activechoices, $filtername, $filterinfo->localstate, false);
$row[] = $select;
// Settings link, if required
if ($settingscol) {