Merge branch 'MDL-30844-master' of https://github.com/FMCorz/moodle

This commit is contained in:
Dan Poltawski 2012-07-10 14:47:35 +08:00
commit 2c0c3379fc
4 changed files with 8 additions and 6 deletions

View File

@ -90,6 +90,9 @@ class MoodleQuickForm_group extends HTML_QuickForm_group{
return 'static';
}
} else {
if ($this->getGroupType() == 'submit') {
return 'actionbuttons';
}
return 'fieldset';
}
}

View File

@ -87,7 +87,7 @@ class MoodleQuickForm_submit extends HTML_QuickForm_submit {
if ($this->_flagFrozen){
return 'nodisplay';
} else {
return 'default';
return 'actionbuttons';
}
}

View File

@ -2233,6 +2233,8 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{
$this->_elementTemplates = array(
'default'=>"\n\t\t".'<div id="{id}" class="fitem {advanced}<!-- BEGIN required --> required<!-- END required --> fitem_{type}"><div class="fitemtitle"><label>{label}<!-- BEGIN required -->{req}<!-- END required -->{advancedimg} {help}</label></div><div class="felement {type}<!-- BEGIN error --> error<!-- END error -->"><!-- BEGIN error --><span class="error">{error}</span><br /><!-- END error -->{element}</div></div>',
'actionbuttons'=>"\n\t\t".'<div id="{id}" class="fitem fitem_actionbuttons fitem_{type}"><div class="felement {type}">{element}</div></div>',
'fieldset'=>"\n\t\t".'<div id="{id}" class="fitem {advanced}<!-- BEGIN required --> required<!-- END required --> fitem_{type}"><div class="fitemtitle"><div class="fgrouplabel"><label>{label}<!-- BEGIN required -->{req}<!-- END required -->{advancedimg} {help}</label></div></div><fieldset class="felement {type}<!-- BEGIN error --> error<!-- END error -->"><!-- BEGIN error --><span class="error">{error}</span><br /><!-- END error -->{element}</fieldset></div>',
'static'=>"\n\t\t".'<div class="fitem {advanced}"><div class="fitemtitle"><div class="fstaticlabel"><label>{label}<!-- BEGIN required -->{req}<!-- END required -->{advancedimg} {help}</label></div></div><div class="felement fstatic <!-- BEGIN error --> error<!-- END error -->"><!-- BEGIN error --><span class="error">{error}</span><br /><!-- END error -->{element}&nbsp;</div></div>',

View File

@ -78,11 +78,8 @@ echo $attemptobj->render_question_for_commenting($slot);
</div>
<fieldset class="hidden">
<div>
<div class="fitem">
<div class="fitemtitle">
<div class="fgrouplabel"><label> </label></div>
</div>
<fieldset class="felement fgroup">
<div class="fitem fitem_actionbuttons fitem_fsubmit">
<fieldset class="felement fsubmit">
<input id="id_submitbutton" type="submit" name="submit" value="<?php
print_string('save', 'quiz'); ?>"/>
</fieldset>