mirror of
https://github.com/moodle/moodle.git
synced 2025-08-04 16:36:37 +02:00
MDL-8690 popup form now uses div instead of invisible fieldset; merged from MOODLE_18_STABLE
This commit is contained in:
parent
224aa44a8d
commit
60ec23afba
2 changed files with 6 additions and 5 deletions
|
@ -944,7 +944,7 @@ function popup_form($common, $options, $formid, $selected='', $nothing='choose',
|
||||||
$selectlabel = '<label for="'.$formid.'_jump">'.$selectlabel.'</label>';
|
$selectlabel = '<label for="'.$formid.'_jump">'.$selectlabel.'</label>';
|
||||||
}
|
}
|
||||||
|
|
||||||
$output .= '<fieldset class="invisiblefieldset">'.$selectlabel.$button.'<select id="'.$formid.'_jump" name="jump" onchange="'.$targetwindow.'.location=document.getElementById(\''.$formid.'\').jump.options[document.getElementById(\''.$formid.'\').jump.selectedIndex].value;">'."\n";
|
$output .= '<div>'.$selectlabel.$button.'<select id="'.$formid.'_jump" name="jump" onchange="'.$targetwindow.'.location=document.getElementById(\''.$formid.'\').jump.options[document.getElementById(\''.$formid.'\').jump.selectedIndex].value;">'."\n";
|
||||||
|
|
||||||
if ($nothing != '') {
|
if ($nothing != '') {
|
||||||
$output .= " <option value=\"javascript:void(0)\">$nothing</option>\n";
|
$output .= " <option value=\"javascript:void(0)\">$nothing</option>\n";
|
||||||
|
@ -1024,7 +1024,7 @@ function popup_form($common, $options, $formid, $selected='', $nothing='choose',
|
||||||
"\n//<![CDATA[\n".
|
"\n//<![CDATA[\n".
|
||||||
'document.getElementById("noscript'.$formid.'").style.display = "none";'.
|
'document.getElementById("noscript'.$formid.'").style.display = "none";'.
|
||||||
"\n//]]>\n".'</script>';
|
"\n//]]>\n".'</script>';
|
||||||
$output .= '</fieldset>';
|
$output .= '</div>';
|
||||||
$output .= '</form>';
|
$output .= '</form>';
|
||||||
|
|
||||||
if ($return) {
|
if ($return) {
|
||||||
|
@ -5775,4 +5775,4 @@ function frametarget() {
|
||||||
}
|
}
|
||||||
|
|
||||||
// vim:autoindent:expandtab:shiftwidth=4:tabstop=4:tw=140:
|
// vim:autoindent:expandtab:shiftwidth=4:tabstop=4:tw=140:
|
||||||
?>
|
?>
|
||||||
|
|
|
@ -341,8 +341,9 @@ img.emoticon {
|
||||||
height: 15px;
|
height: 15px;
|
||||||
}
|
}
|
||||||
|
|
||||||
form.popupform {
|
form.popupform,
|
||||||
display: inline;
|
form.popupform div {
|
||||||
|
display: inline;
|
||||||
}
|
}
|
||||||
|
|
||||||
form.popupform label {
|
form.popupform label {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue