Skip to content

Commit

Permalink
changes to html structure for rendering of forms in line with http://…
Browse files Browse the repository at this point in the history
  • Loading branch information
jamiesensei committed Sep 27, 2006
1 parent 57a763a commit 49c5368
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 19 deletions.
3 changes: 1 addition & 2 deletions course/edit_form.php
Expand Up @@ -200,7 +200,7 @@
$options[1] = get_string("yes");
$mform->addElement('header', '', get_string("restrictmodules"));
$mform->addElement('select', 'restrictmodules', get_string("restrictmodules"), $options,
array('onChange'=>"document.getElementById('allowedmods').disabled=".
array('onChange'=>"document.getElementById('id_allowedmods').disabled=".
"((this.selectedIndex==0)?true:false);"));
$mods = array(0=>get_string('allownone'));
$mods += get_records_menu("modules", '','','','id, name');
Expand Down Expand Up @@ -292,5 +292,4 @@ function form_check($fields){

$renderer =& $mform->defaultRenderer();
$renderer->addStopFieldsetElements('submit');

?>
45 changes: 28 additions & 17 deletions lib/formslib.php
Expand Up @@ -219,15 +219,16 @@ class moodleform_renderer extends HTML_QuickForm_Renderer_Tableless{
*/
var $_elementTemplates;

// uncomment this and edit formslib.php below for
// uncomment templates below and edit formslib.php for
// ol li containers for form items.

// /**
// * Template used when opening a hidden fieldset
// * (i.e. a fieldset that is opened when there is no header element)
// * @var string
// * @access private
// */
/**
* Template used when opening a hidden fieldset
* (i.e. a fieldset that is opened when there is no header element)
* @var string
* @access private
*/
var $_openHiddenFieldsetTemplate = "\n\t<fieldset class=\"hidden\">";
// var $_openHiddenFieldsetTemplate = "\n\t<fieldset class=\"hidden\">\n\t\t<ol>";
// /**
// * Header Template string
Expand All @@ -236,18 +237,28 @@ class moodleform_renderer extends HTML_QuickForm_Renderer_Tableless{
// */
// var $_headerTemplate =
// "\n\t\t<legend>{header}</legend>\n\t\t<ol>";
// /**
// * Template used when closing a fieldset
// * @var string
// * @access private
// */
// var $_headerTemplate =
// "\n\t\t<legend>{header}</legend>\n\t\t<ol>";
/**
* Template used when closing a fieldset
* @var string
* @access private
*/
var $_closeFieldsetTemplate = "\n\t\t</fieldset>";
// var $_closeFieldsetTemplate = "\n\t\t</ol>\n\t</fieldset>";

/**
* Required Note template string
* @var string
* @access private
*/
var $_requiredNoteTemplate =
"\n\t\t<div class=\"fdescription\">{requiredNote}</div>";
var $_htmleditors=array();
function moodleform_renderer(){
// switch next two lines for ol li containers for form items.
// $this->_elementTemplates=array('default'=>"\n\t\t<li class=\"qfrow\"><label class=\"qflabel\">{label}{help}<!-- BEGIN required -->{req}<!-- END required --></label><div class=\"qfelement<!-- BEGIN error --> error<!-- END error --> {type}\"><!-- BEGIN error --><span class=\"error\">{error}</span><br /><!-- END error -->{element}</div></li>");
$this->_elementTemplates=array('default'=>"\n\t\t<div class=\"qfrow\"><label class=\"qflabel\">{label}{help}<!-- BEGIN required -->{req}<!-- END required --></label><div class=\"qfelement<!-- BEGIN error --> error<!-- END error --> {type}\"><!-- BEGIN error --><span class=\"error\">{error}</span><br /><!-- END error -->{element}</div></div>"); /*,
// $this->_elementTemplates=array('default'=>"\n\t\t<li class=\"fitem\"><label>{label}{help}<!-- BEGIN required -->{req}<!-- END required --></label><div class=\"qfelement<!-- BEGIN error --> error<!-- END error --> {type}\"><!-- BEGIN error --><span class=\"error\">{error}</span><br /><!-- END error -->{element}</div></li>");
$this->_elementTemplates=array('default'=>"\n\t\t<div class=\"fitem\"><label>{label}{help}<!-- BEGIN required -->{req}<!-- END required --></label><div class=\"felement<!-- BEGIN error --> error<!-- END error --> {type}\"><!-- BEGIN error --><span class=\"error\">{error}</span><br /><!-- END error -->{element}</div></div>"); /*,
will cause problems with client side validation so will leave for now
'fieldset'=>"\n\t\t<div class=\"qfrow\"><label class=\"qflabel\">{label}{help}<!-- BEGIN required -->{req}<!-- END required --></label><fieldset class=\"qfelement<!-- BEGIN error --> error<!-- END error --> {type}\"><!-- BEGIN error --><span class=\"error\">{error}</span><br /><!-- END error -->{element}</fieldset></div>");*/

Expand All @@ -271,7 +282,7 @@ function startGroup(&$group, $required, $error){
$html =str_replace('{help}', '', $html);

}
$html =str_replace('{type}', 'group', $html);
$html =str_replace('{type}', 'fgroup', $html);

$this->_templates[$group->getName()]=$html;
// Fix for bug in tableless quickforms that didn't allow you to stop a
Expand All @@ -292,15 +303,15 @@ function renderElement(&$element, $required, $error){
$html = $this->_elementTemplates['default'];

}
$html =str_replace('{type}', $element->getType(), $html);
$html =str_replace('{type}', 'f'.$element->getType(), $html);
if (method_exists($element, 'getHelpButton')){
$html=str_replace('{help}', $element->getHelpButton(), $html);
}else{
$html=str_replace('{help}', '', $html);

}
$this->_templates[$element->getName()]=$html;

$element->updateAttributes(array('id'=>'id_'.$element->getName()));
parent::renderElement($element, $required, $error);
}

Expand Down

0 comments on commit 49c5368

Please sign in to comment.