wrapping group element in a fieldset tag

diff --git a/lib/formslib.php b/lib/formslib.php
index 4521e742d885e994726640d71c0cf707908fb935..4c709094422a2fffb690817db6fc4362c7c167e3 100644 (file)
--- a/lib/formslib.php
+++ b/lib/formslib.php
@@ -258,9 +258,8 @@ class moodleform_renderer extends HTML_QuickForm_Renderer_Tableless{
     function moodleform_renderer(){
         // switch next two lines for ol li containers for form items.
         //        $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>");*/
+        $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>",
+        'fieldset'=>"\n\t\t<div class=\"fitem\"><label>{label}{help}<!-- BEGIN required -->{req}<!-- END required --></label><fieldset class=\"felement<!-- BEGIN error --> error<!-- END error --> {type}\"><!-- BEGIN error --><span class=\"error\">{error}</span><br /><!-- END error -->{element}</fieldset></div>");
 
         parent::HTML_QuickForm_Renderer_Tableless();
     }
@@ -311,7 +310,7 @@ class moodleform_renderer extends HTML_QuickForm_Renderer_Tableless{
             
         }
         $this->_templates[$element->getName()]=$html;
-        $element->updateAttributes(array('id'=>'id_'.$element->getName()));
+        $element->updateAttributes(array('id'=>'id_'.$element->getAttribute('id')));
         parent::renderElement($element, $required, $error);
     }
 

diff --git a/theme/standard/styles_form.css b/theme/standard/styles_form.css
index eeca6810c00b76c0b0ce61b6e53b272b4ff8b974..2e1a6f1e1ddf94d81e4a02f059739b6032c5e38e 100644 (file)
--- a/theme/standard/styles_form.css
+++ b/theme/standard/styles_form.css
@@ -15,9 +15,12 @@ form.mform fieldset {
     margin: 0;
     width:100%;
 }
-form.mform fieldset.hidden {
+form.mform fieldset.hidden, form.mform fieldset.felement {
     border: 0;
 }
+form.mform fieldset.felement {
+    width: auto;
+}
 form.mform fieldset legend {
     font-weight: bold;
 }
@@ -50,13 +53,13 @@ form.mform label {
     margin: 0 0 0 0;
     text-align: right;
 }
-div.fitem div.fgroup label {
+div.fitem fieldset.fgroup label {
     display:inline;
     float: none;
     width: auto;
 }
 
-form.mform div.felement {
+form.mform div.felement,  form.mform fieldset.felement{
     /* display: inline; */
     display: block;
     float: left;