]> git.mjollnir.org Git - moodle.git/commitdiff
added setAdvanced MoodleQuickForm method. And added closeHeaderAfter method
authorjamiesensei <jamiesensei>
Thu, 14 Dec 2006 12:44:10 +0000 (12:44 +0000)
committerjamiesensei <jamiesensei>
Thu, 14 Dec 2006 12:44:10 +0000 (12:44 +0000)
17 files changed:
lang/en_utf8/form.php
lib/form/req.png
lib/form/select.php
lib/form/text.php
lib/formslib.php
lib/javascript-static.js
lib/javascript.php
mod/chat/mod_form.php
mod/choice/mod_form.php
mod/data/mod_form.php
mod/exercise/mod_form.php
mod/forum/mod_form.php
mod/forum/post_form.php
mod/glossary/mod_form.php
mod/journal/mod_form.php
mod/label/mod_form.php
mod/lesson/mod_form.php

index 90ce2018bc0497b5291d437ec6d0309ffe80d19e..c1ee2eea58947db022627fa8cbd71b00dbeaea2b 100644 (file)
@@ -1,6 +1,4 @@
 <?PHP // $Id$
-      // form.php - created with Moodle 1.7 beta + (2006101003)
-
 
 $string['denotesreq'] = '$a denotes required field.';
 $string['err_alphanumeric']='You must enter only letters or numbers here.';
@@ -25,4 +23,8 @@ $string['month']='Month';
 $string['year']='Year';
 $string['hour']='Hour';
 $string['minute']='Minute';
+
+$string['advancedelement']='Advanced Element';
+$string['hideadvanced']='Hide Advanced';
+$string['showadvanced']='Show Advanced';
 ?>
\ No newline at end of file
index e843ed30a870f4bb60f548c393bc4afa386899f5..52f81359009cb74742bcfa9693f298164645911d 100644 (file)
Binary files a/lib/form/req.png and b/lib/form/req.png differ
index e349211b82f623ce4015db374c92d026fbd38732..63df3f919b00da5ad581885de9b0f9205d5af08b 100644 (file)
@@ -19,8 +19,8 @@ class MoodleQuickForm_select extends HTML_QuickForm_select{
         $this->_hiddenLabel = $hiddenLabel;
     }
     function toHtml(){
-        $this->_generateId();
         if ($this->_hiddenLabel){
+            $this->_generateId();
             return '<label class="accesshide" for="'.$this->getAttribute('id').'" >'.
                         $this->getLabel().'</label>'.parent::toHtml();
         } else {
index cae359cfa88ceb15fecc77252a747b875b149e5d..c517d1a11194bccee8b74be4f7a0922d5a17b04c 100644 (file)
@@ -19,8 +19,8 @@ class MoodleQuickForm_text extends HTML_QuickForm_text{
         $this->_hiddenLabel = $hiddenLabel;
     }
     function toHtml(){
-        $this->_generateId();
         if ($this->_hiddenLabel){
+            $this->_generateId();
             return '<label class="accesshide" for="'.$this->getAttribute('id').'" >'.
                         $this->getLabel().'</label>'.parent::toHtml();
         } else {
index a772712414f56f22a09cf4c9bc4b50117729e6fd..d91d6fee190b0a382b010bd3a947ba35aa7e365a 100644 (file)
@@ -1,4 +1,4 @@
-<?php // $Id$
+`<?php // $Id$
 /**
  * formslib.php - library of classes for creating forms in Moodle, based on PEAR QuickForms.
  *
@@ -31,6 +31,9 @@ require_once 'HTML/QuickForm/Renderer/Tableless.php';
 
 require_once $CFG->libdir.'/uploadlib.php';
 
+define('FORM_ADVANCEDIMAGEURL', $CFG->wwwroot.'/lib/form/adv.gif');
+define('FORM_REQIMAGEURL', $CFG->wwwroot.'/lib/form/req.gif');
+
 if ($CFG->debug >= DEBUG_ALL){
     PEAR::setErrorHandling(PEAR_ERROR_PRINT);
 }
@@ -386,6 +389,7 @@ class moodleform {
 
 
 
+
     /**
      * Method to add a repeating group of elements to a form.
      *
@@ -459,11 +463,11 @@ class moodleform {
             }
         }
         $mform->addElement('submit', $addfieldsname, get_string('addfields', 'form', $addfieldsno),
-                            array('onclick'=>'this.form.submit();'));//need this to bypass client validation
+                            array('onclick'=>'skipClientValidation = true; return true;'));//need this to bypass client validation
 
         $renderer =& $mform->defaultRenderer();
         $renderer->addStopFieldsetElements($addfieldsname);
-
+        return $repeats;
     }
 }
 
@@ -490,6 +494,20 @@ class MoodleQuickForm extends HTML_QuickForm_DHTMLRulesTableless {
      */
     var $_cancelButtons=array();
 
+    /**
+     * Array whose keys are element names. If the key exists this is a advanced element
+     *
+     * @var array
+     */
+    var $_advancedElements = array();
+
+    /**
+     * Whether to display advanced elements (on page load)
+     *
+     * @var boolean
+     */
+    var $_showAdvanced = null;
+
     /**
      * Class constructor - same parameters as HTML_QuickForm_DHTMLRulesTableless
      * @param    string      $formName          Form's name.
@@ -516,12 +534,120 @@ class MoodleQuickForm extends HTML_QuickForm_DHTMLRulesTableless {
         }else {
             $this->updateAttributes(array('class'=>'mform'));
         }
-        $this->_helpImageURL="$CFG->wwwroot/lib/form/req.gif";
-        $this->_reqHTML = '<img alt="'.get_string('requiredelement', 'form').'" src="'.$this->_helpImageURL.'" />';
+        $this->_reqHTML = '<img alt="'.get_string('requiredelement', 'form').'" src="'.FORM_REQIMAGEURL.'" />';
+        $this->_advancedHTML = '<img alt="'.get_string('advancedelement', 'form').'" src="'.FORM_ADVANCEDIMAGEURL.'" />';
         $this->setRequiredNote(get_string('denotesreq', 'form',
             helpbutton('requiredelement', get_string('requiredelement', 'form'),'moodle',
                  true, false, '', true, '<img alt="'.get_string('requiredelement', 'form').'" src="'.
-            $this->_helpImageURL.'" />')));
+            FORM_REQIMAGEURL.'" />')));
+    }
+
+    function setShowAdvanced($showadvancedNow){
+        $this->_showAdvanced=$showadvancedNow;
+    }
+    function getShowAdvanced(){
+        return $this->_showAdvanced;
+    }
+
+    /**
+     * Adds an element into the form
+     *
+     * If $element is a string representing element type, then this
+     * method accepts variable number of parameters, their meaning
+     * and count depending on $element
+     *
+     * @param    mixed      $element        element object or type of element to add (text, textarea, file...)
+     * @since    1.0
+     * @return   object     reference to element
+     * @access   public
+     * @throws   HTML_QuickForm_Error
+     */
+    function addElement($element)
+    {
+        //call parent with a variable ammount of arguments
+        $args = func_get_args();
+        $parent_name = get_parent_class($this);
+        //static method call
+
+        return call_user_func_array(array($parent_name, 'addElement'), $args);
+    }
+
+   /**
+    * Accepts a renderer
+    *
+    * @param HTML_QuickForm_Renderer  An HTML_QuickForm_Renderer object
+    * @since 3.0
+    * @access public
+    * @return void
+    */
+    function accept(&$renderer)
+    {
+        if (method_exists($renderer, 'setAdvancedElements')){
+            //check for visible fieldsets where all elements are advanced
+            //and mark these headers as advanced as well.
+            //And mark all elements in a advanced header as advanced
+            $stopFields = $renderer->getStopFieldSetElements();
+            $lastHeader = null;
+            $lastHeaderAdvanced = false;
+            $anyAdvanced = false;
+            foreach (array_keys($this->_elements) as $elementIndex){
+                $element =& $this->_elements[$elementIndex];
+                if ($element->getType()=='header' || in_array($element->getName(), $stopFields)){
+                    if ($anyAdvanced && ($lastHeader!==null)){
+                        $this->setAdvanced($lastHeader->getName());
+                    }
+                    $lastHeaderAdvanced = false;
+                } elseif ($lastHeaderAdvanced) {
+                    $this->setAdvanced($element->getName());
+                }
+                if ($element->getType()=='header'){
+                    $lastHeader =& $element;
+                    $anyAdvanced = false;
+                    $lastHeaderAdvanced = isset($this->_advancedElements[$element->getName()]);
+                } elseif (isset($this->_advancedElements[$element->getName()])){
+                    $anyAdvanced = true;
+                }
+            }
+            $renderer->setAdvancedElements($this->_advancedElements);
+            if (count($this->_advancedElements)){
+
+            }
+        }
+        parent::accept($renderer);
+    }
+
+    function setAdvanced($elementName, $advanced=true){
+        if ($advanced){
+            $this->_advancedElements[$elementName]='';
+        } elseif (isset($this->_advancedElements[$elementName])) {
+            unset($this->_advancedElements[$elementName]);
+        }
+        if ($advanced && $this->getShowAdvanced()===null){
+            //hidden element
+            $showadvanced_last = optional_param('mform_showadvanced_last', 0, PARAM_INT);
+            //button
+            $showadvanced = optional_param('mform_showadvanced', 0, PARAM_RAW);
+            //toggle if button pressed or else stay the same
+            if ($showadvanced && $showadvanced_last){
+                $showadvanced_now = 0;
+            } elseif ($showadvanced && !$showadvanced_last) {
+                $showadvanced_now = 1;
+            } else {
+                $showadvanced_now = $showadvanced_last;
+            }
+
+            $this->setConstants(array('mform_showadvanced_last'=>$showadvanced_now));
+            //below tells form whether to display elements or not
+            $this->setShowAdvanced($showadvanced_now);
+            $this->_registerNoSubmitButton('mform_showadvanced');
+
+            $this->addElement('hidden', 'mform_showadvanced_last');
+        }
+    }
+
+    function closeHeaderBefore($elementName){
+        $renderer =& $this->defaultRenderer();
+        $renderer->addStopFieldsetElements($elementName);
     }
 
     /**
@@ -593,6 +719,10 @@ class MoodleQuickForm extends HTML_QuickForm_DHTMLRulesTableless {
         return $this->_reqHTML;
     }
 
+    function getAdvancedHTML(){
+        return $this->_advancedHTML;
+    }
+
     /**
      * Initializes a default form value. Used to specify the default for a new entry where
      * no data is loaded in using moodleform::set_defaults()
@@ -936,10 +1066,6 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{
     * @access   private
     */
     var $_elementTemplates;
-
-//   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)
@@ -947,16 +1073,13 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{
     * @access   private
     */
     var $_openHiddenFieldsetTemplate = "\n\t<fieldset class=\"hidden\">";
-//    var $_openHiddenFieldsetTemplate = "\n\t<fieldset class=\"hidden\">\n\t\t<ol>";
-//   /**
-//    * Header Template string
-//    * @var      string
-//    * @access   private
-//    */
-//    var $_headerTemplate =
-//        "\n\t\t<legend>{header}</legend>\n\t\t<ol>";
-//    var $_headerTemplate =
-//        "\n\t\t<legend>{header}</legend>\n\t\t<ol>";
+   /**
+    * Header Template string
+    * @var      string
+    * @access   private
+    */
+    var $_headerTemplate =
+       "\n\t\t<legend>{header}{advancedimg}{button}</legend>\n\t\t";
 
    /**
     * Template used when closing a fieldset
@@ -964,7 +1087,6 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{
     * @access   private
     */
     var $_closeFieldsetTemplate = "\n\t\t</fieldset>";
-//    var $_closeFieldsetTemplate = "\n\t\t</ol>\n\t</fieldset>";
 
    /**
     * Required Note template string
@@ -974,18 +1096,38 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{
     var $_requiredNoteTemplate =
         "\n\t\t<div class=\"fdescription\">{requiredNote}</div>";
 
+    var $_advancedElements = array();
+
+    /**
+     * Whether to display advanced elements (on page load)
+     *
+     * @var integer 1 means show 0 means hide
+     */
+    var $_showAdvanced;
+
     function MoodleQuickForm_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\"><span class=\"fitemtitle\"><label>{label}<!-- BEGIN required -->{req}<!-- END required --></label>{help}</span><div class=\"felement {type}<!-- BEGIN error --> error<!-- END error -->\"><!-- BEGIN error --><span class=\"error\" id=\"id_error_{name}\">{error}</span><br /><!-- END error -->{element}</div></div>",
-        'fieldset'=>"\n\t\t<div class=\"fitem\"><span class=\"fitemtitle\"><label>{label}<!-- BEGIN required -->{req}<!-- END required --></label>{help}</span><fieldset class=\"felement {type}<!-- BEGIN error --> error<!-- END error -->\"><!-- BEGIN error --><span class=\"error\" id=\"id_error_{name}\">{error}</span><br /><!-- END error -->{element}</fieldset></div>");
+        $this->_elementTemplates = array('default'=>"\n\t\t<div class=\"fitem {advanced}\"><span class=\"fitemtitle\"><label>{label}<!-- BEGIN required -->{req}<!-- END required -->{advancedimg}</label>{help}</span><div class=\"felement {type}<!-- BEGIN error --> error<!-- END error -->\"><!-- BEGIN error --><span class=\"error\" id=\"id_error_{name}\">{error}</span><br /><!-- END error -->{element}</div></div>",
+        'fieldset'=>"\n\t\t<div class=\"fitem {advanced}\"><span class=\"fitemtitle\"><label>{label}<!-- BEGIN required -->{req}<!-- END required -->{advancedimg}</label>{help}</span><fieldset class=\"felement {type}<!-- BEGIN error --> error<!-- END error -->\"><!-- BEGIN error --><span class=\"error\" id=\"id_error_{name}\">{error}</span><br /><!-- END error -->{element}</fieldset></div>");
 
         parent::HTML_QuickForm_Renderer_Tableless();
     }
 
+    function setAdvancedElements($elements){
+        $this->_advancedElements = $elements;
+    }
+
+    /**
+     * What to do when starting the form
+     *
+     * @param MoodleQuickForm $form
+     */
     function startForm(&$form){
         $this->_reqHTML = $form->getReqHTML();
         $this->_elementTemplates = str_replace('{req}', $this->_reqHTML, $this->_elementTemplates);
+        $this->_advancedHTML = $form->getAdvancedHTML();
+        $this->_showAdvanced = $form->getShowAdvanced();
         parent::startForm($form);
     }
 
@@ -996,11 +1138,22 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{
             $html = $this->_elementTemplates['default'];
 
         }
+        if ($this->_showAdvanced){
+            $advclass = ' advanced';
+        } else {
+            $advclass = ' advanced hide';
+        }
+        if (isset($this->_advancedElements[$group->getName()])){
+            $html =str_replace(' {advanced}', $advclass, $html);
+            $html =str_replace('{advancedimg}', $this->_advancedHTML, $html);
+        } else {
+            $html =str_replace(' {advanced}', '', $html);
+            $html =str_replace('{advancedimg}', '', $html);
+        }
         if (method_exists($group, 'getHelpButton')){
             $html =str_replace('{help}', $group->getHelpButton(), $html);
         }else{
             $html =str_replace('{help}', '', $html);
-
         }
         $html =str_replace('{name}', $group->getName(), $html);
         $html =str_replace('{type}', 'fgroup', $html);
@@ -1023,7 +1176,21 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{
             $html = $this->_elementTemplates[$element->getElementTemplateType()];
         }else{
             $html = $this->_elementTemplates['default'];
-
+        }
+        if ($this->_showAdvanced){
+            $advclass = ' advanced';
+        } else {
+            $advclass = ' advanced hide';
+        }
+        if (isset($this->_advancedElements[$element->getName()])){
+            $html =str_replace(' {advanced}', $advclass, $html);
+        } else {
+            $html =str_replace(' {advanced}', '', $html);
+        }
+        if (isset($this->_advancedElements[$element->getName()])||$element->getName() == 'mform_showadvanced'){
+            $html =str_replace('{advancedimg}', $this->_advancedHTML, $html);
+        } else {
+            $html =str_replace('{advancedimg}', '', $html);
         }
         $html =str_replace('{type}', 'f'.$element->getType(), $html);
         $html =str_replace('{name}', $element->getName(), $html);
@@ -1045,6 +1212,7 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{
         }
         parent::renderElement($element, $required, $error);
     }
+
     function finishForm(&$form){
         parent::finishForm($form);
         // add a lockoptions script
@@ -1052,6 +1220,71 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{
             $this->_html = $this->_html . "\n" . $script;
         }
     }
+   /**
+    * Called when visiting a header element
+    *
+    * @param    object     An HTML_QuickForm_header element being visited
+    * @access   public
+    * @return   void
+    */
+    function renderHeader(&$header)    {
+        $name = $header->getName();
+
+        $id = empty($name) ? '' : ' id="' . $name . '"';
+        if (is_null($header->_text)) {
+            $header_html = '';
+        } elseif (!empty($name) && isset($this->_templates[$name])) {
+            $header_html = str_replace('{header}', $header->toHtml(), $this->_templates[$name]);
+        } else {
+            $header_html = str_replace('{header}', $header->toHtml(), $this->_headerTemplate);
+        }
+
+        if (isset($this->_advancedElements[$name])){
+            $header_html =str_replace('{advancedimg}', $this->_advancedHTML, $header_html);
+        } else {
+            $header_html =str_replace('{advancedimg}', '', $header_html);
+        }
+        $elementName='mform_showadvanced';
+        if ($this->_showAdvanced==0){
+            $buttonlabel = get_string('showadvanced', 'form');
+        } else {
+            $buttonlabel = get_string('hideadvanced', 'form');
+        }
+
+        if (isset($this->_advancedElements[$name])){
+            $showtext="'".get_string('showadvanced', 'form')."'";
+            $hidetext="'".get_string('hideadvanced', 'form')."'";
+            //onclick returns false so if js is on then page is not submitted.
+            $onclick = 'return showAdvancedOnClick(this, '.$hidetext.', '.$showtext.');';
+            $button = '<input name="'.$elementName.'" value="'.$buttonlabel.'" type="submit" onclick="'.$onclick.'" />';
+            $header_html =str_replace('{button}', $button, $header_html);
+        } else {
+            $header_html =str_replace('{button}', '', $header_html);
+        }
+
+        if ($this->_fieldsetsOpen > 0) {
+            $this->_html .= $this->_closeFieldsetTemplate;
+            $this->_fieldsetsOpen--;
+        }
+
+        $openFieldsetTemplate = str_replace('{id}', $id, $this->_openFieldsetTemplate);
+        if ($this->_showAdvanced){
+            $advclass = ' class="advanced"';
+        } else {
+            $advclass = ' class="advanced hide"';
+        }
+        if (isset($this->_advancedElements[$name])){
+            $openFieldsetTemplate = str_replace('{advancedclass}', $advclass, $openFieldsetTemplate);
+        } else {
+            $openFieldsetTemplate = str_replace('{advancedclass}', '', $openFieldsetTemplate);
+        }
+        $this->_html .= $openFieldsetTemplate . $header_html;
+        $this->_fieldsetsOpen++;
+    } // end func renderHeader
+
+    function getStopFieldsetElements(){
+        return $this->_stopFieldsetElements;
+    }
 }
 
 
@@ -1078,5 +1311,6 @@ MoodleQuickForm::registerElementType('modgrade', "$CFG->libdir/form/modgrade.php
 MoodleQuickForm::registerElementType('cancel', "$CFG->libdir/form/cancel.php", 'MoodleQuickForm_cancel');
 MoodleQuickForm::registerElementType('button', "$CFG->libdir/form/button.php", 'MoodleQuickForm_button');
 MoodleQuickForm::registerElementType('choosecoursefile', "$CFG->libdir/form/choosecoursefile.php", 'MoodleQuickForm_choosecoursefile');
+MoodleQuickForm::registerElementType('header', "$CFG->libdir/form/header.php", 'MoodleQuickForm_header');
 
 ?>
\ No newline at end of file
index 553571ac910265838ec26b4e8ac9bdf164c15142..2a26f354b29ebbb0bb20b6590b5ac16518c776eb 100644 (file)
@@ -194,6 +194,66 @@ function findParentNode(el, elName, elClass, elId) {
     }
     return el;
 }
+/*
+    findChildNode (start, elementName, elementClass, elementID)
+
+    Travels down the DOM hierarchy to find all child elements with the
+    specified tag name, class, and id. All conditions must be met,
+    but any can be ommitted.
+*/
+function findChildNodes(start, tagName, elementClass, elementID, elementName) {
+    var children = new Array();
+    for (var childIndex in start.childNodes) {
+        var child = start.childNodes[childIndex];
+        if(
+            (child.nodeType == 1) &&//element node type
+            (!tagName || child.nodeName == tagName) &&
+            (!elementClass || child.className.indexOf(elementClass) != -1) &&
+            (!elementID || child.id == elementID) &&
+            (!elementName || child.name == elementName))
+        {
+            children = children.concat(child);
+        }
+        children = children.concat(findChildNodes(child, tagName, elementClass, elementID, elementName));
+    }
+    return children;
+}
+/*
+    elementSetHide (elements, hide)
+
+    Adds or removes the "hide" class for the specified elements depending on boolean hide.
+*/
+function elementShowAdvanced(elements, show) {
+    for (var elementIndex in elements){
+        element = elements[elementIndex];
+        element.className = element.className.replace(new RegExp(' ?hide'), '')
+        if(!show) {
+            element.className += ' hide';
+        }
+    }
+}
+
+function showAdvancedOnClick(button, hidetext, showtext){
+    var toSet=findChildNodes(button.form, null, 'advanced');
+    var buttontext = '';
+    if (button.form.elements['mform_showadvanced_last'].value == '0') {
+        elementShowAdvanced(toSet, true);
+        buttontext = hidetext;
+        button.form.elements['mform_showadvanced_last'].value = '1';
+    } else {
+        elementShowAdvanced(toSet, false);
+        buttontext = showtext;
+        button.form.elements['mform_showadvanced_last'].value = '0';
+    }
+    var formelements = button.form.elements;
+    for (var i in formelements){
+        if (formelements[i].name=='mform_showadvanced'){
+            formelements[i].value = buttontext;
+        }
+    }
+    //never submit the form if js is enabled.
+    return false;
+}
 
 /*
     elementToggleHide (element, elementFinder)
@@ -204,7 +264,7 @@ function findParentNode(el, elName, elClass, elId) {
 
     If persistent == true, also sets a cookie for this.
 */
-function elementToggleHide(el, persistent, elementFinder, pixPath) {
+function elementToggleHide(el, persistent, elementFinder) {
     if(!elementFinder) {
         var obj = el;
     }
@@ -213,14 +273,13 @@ function elementToggleHide(el, persistent, elementFinder, pixPath) {
     }
     if(obj.className.indexOf('hidden') == -1) {
         obj.className += ' hidden';
-        document.getElementById('togglehide_'+obj.id).setAttribute('src', pixPath+'/t/switch_plus.gif');
-               var shown = 0;
+        var shown = 0;
     }
     else {
-        obj.className = obj.className.replace(new RegExp(' ?hidden'), '');
-        document.getElementById('togglehide_'+obj.id).setAttribute('src', pixPath+'/t/switch_minus.gif');
-               var shown = 1;
+        obj.className = obj.className.replace(new RegExp(' ?hidden'), '')
+        var shown = 1;
     }
+
     if(persistent == true) {
         new cookie('hide:' + obj.id, 1, (shown ? -1 : 356), '/').set();
     }
index 3692b28b9a4d38c5300fb2aa2270c75e71e8170d..79c7a8b626de311623a50bcfb6ea573782431a49 100644 (file)
@@ -71,7 +71,6 @@ function inserttext(text) {
     echo "  $insertfield.focus();\n";
 ?>
 }
-
 <?php if (!empty($focus)) {
     if(($pos = strpos($focus, '.')) !== false) {
         $topelement = substr($focus, 0, $pos);
index 03b6fc0748079b936769a3bf0f58cd349ada414c..a6916be04fd5d2f0c975f2d05be956c249796b49 100644 (file)
@@ -7,7 +7,6 @@ class chat_mod_form extends moodleform_mod {
 
                global $CFG;
                $mform    =& $this->_form;
-               $renderer =& $mform->defaultRenderer();
 
 //-------------------------------------------------------------------------------
         $mform->addElement('header', 'general', get_string('general', 'form'));
@@ -54,7 +53,7 @@ class chat_mod_form extends moodleform_mod {
         $buttonarray[] = &$mform->createElement('reset', 'resetbutton', get_string('revert'));
         $buttonarray[] = &$mform->createElement('cancel');
         $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false);
-               $renderer->addStopFieldsetElements('buttonar');
+               $mform->closeHeaderBefore('buttonar');
        }
 
 
index 1a7e201b347af6ab29a72fb9c4ef2a0b38a73113..38256ee89975f557b7e3567e4165864eca2d877b 100644 (file)
@@ -7,7 +7,6 @@ class choice_mod_form extends moodleform_mod {
            global $CHOICE_SHOWRESULTS, $CHOICE_PUBLISH, $CHOICE_DISPLAY;
 
                $mform    =& $this->_form;
-               $renderer =& $mform->defaultRenderer();
 
 //-------------------------------------------------------------------------------
         $mform->addElement('header', 'general', get_string('general', 'form'));
@@ -22,6 +21,7 @@ class choice_mod_form extends moodleform_mod {
 
         $mform->addElement('format', 'format', get_string('format'));
 
+//-------------------------------------------------------------------------------
         $repeatarray=array();
         $repeatarray[] = &MoodleQuickForm::createElement('header', '', get_string('choice','choice'));
         $repeatarray[] = &MoodleQuickForm::createElement('text', 'option', get_string('choice','choice'));
@@ -79,6 +79,7 @@ class choice_mod_form extends moodleform_mod {
 
         $mform->addElement('selectyesno', 'showunanswered', get_string("showunanswered", "choice"));
 
+
 //-------------------------------------------------------------------------------
                $this->standard_coursemodule_elements();
 //-------------------------------------------------------------------------------
@@ -88,7 +89,7 @@ class choice_mod_form extends moodleform_mod {
         $buttonarray[] = &$mform->createElement('reset', 'resetbutton', get_string('revert'));
         $buttonarray[] = &$mform->createElement('cancel');
         $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false);
-               $renderer->addStopFieldsetElements('buttonar');
+               $mform->closeHeaderBefore('buttonar');
        }
 
        function defaults_preprocessing(&$default_values){
index 7f7116a143c04939c09b0ede08e119b85c43dca4..38b6910eb1e6c189e24894c4ace6cfb9a68496a0 100644 (file)
@@ -7,7 +7,6 @@ class data_mod_form extends moodleform_mod {
 
         global $CFG;
         $mform    =& $this->_form;
-        $renderer =& $mform->defaultRenderer();
 
 //-------------------------------------------------------------------------------
         $mform->addElement('header', 'general', get_string('general', 'form'));
@@ -63,7 +62,7 @@ class data_mod_form extends moodleform_mod {
         $buttonarray[] = &$mform->createElement('reset', 'resetbutton', get_string('revert'));
         $buttonarray[] = &$mform->createElement('cancel');
         $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false);
-        $renderer->addStopFieldsetElements('buttonar');
+               $mform->closeHeaderBefore('buttonar');
     }
 
 
index 9e93d4517c0ecd5e2aa850c0480860e1493bc199..58121214a359eeb14e6cc01bc7206a65de0bf0f0 100644 (file)
@@ -7,7 +7,6 @@ class exercise_mod_form extends moodleform_mod {
 
                global $CFG, $COURSE, $EXERCISE_TYPE, $EXERCISE_ASSESSMENT_COMPS;
                $mform    =& $this->_form;
-               $renderer =& $mform->defaultRenderer();
 
 //-------------------------------------------------------------------------------
         $mform->addElement('header', 'general', get_string('general', 'form'));
@@ -107,7 +106,7 @@ class exercise_mod_form extends moodleform_mod {
         $buttonarray[] = &$mform->createElement('reset', 'resetbutton', get_string('revert'));
         $buttonarray[] = &$mform->createElement('cancel');
         $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false);
-               $renderer->addStopFieldsetElements('buttonar');
+               $mform->closeHeaderBefore('buttonar');
        }
 
 
index c254ca912ae4f7b1ae2474bd79af58d5bac3bc52..cc4fe0c1c642fed9d0dd201c111e8d6d2bd765ae 100644 (file)
@@ -7,7 +7,6 @@ class forum_mod_form extends moodleform_mod {
 
                global $CFG, $FORUM_TYPES, $COURSE;
                $mform    =& $this->_form;
-               $renderer =& $mform->defaultRenderer();
 
 //-------------------------------------------------------------------------------
         $mform->addElement('header', 'general', get_string('general', 'form'));
@@ -131,7 +130,7 @@ class forum_mod_form extends moodleform_mod {
         $buttonarray[] = &$mform->createElement('reset', 'resetbutton', get_string('revert'));
         $buttonarray[] = &$mform->createElement('cancel');
         $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false);
-               $renderer->addStopFieldsetElements('buttonar');
+               $mform->closeHeaderBefore('buttonar');
        }
 
        function definition_after_data(){
index 02da5496af8afb2c13d4ece53544a8be5e19ff67..3a6ba948e481622fe159c5ae6251ce7afe52d8b9 100644 (file)
@@ -8,7 +8,6 @@ class forum_post_form extends moodleform {
 
                global $CFG;
                $mform    =& $this->_form;
-               $renderer =& $mform->defaultRenderer();
 
         $course        = $this->_customdata['course'];
                $coursecontext = $this->_customdata['coursecontext'];
@@ -86,7 +85,7 @@ class forum_post_form extends moodleform {
                        $submit_string = get_string('posttoforum', 'forum');
                }
                $mform->addElement('submit', 'submitbutton', $submit_string);
-               $renderer->addStopFieldsetElements('submitbutton');
+               $mform->closeHeaderBefore('submitbutton');
 
                $mform->addElement('hidden', 'course');
                $mform->setType('course', PARAM_INT);
index c24971fe2b970064be51c5353c0da230a9286204..ccd523f996212c3fbec16962c491e2821233dc0c 100644 (file)
@@ -7,7 +7,6 @@ class glossary_mod_form extends moodleform_mod {
 
                global $CFG, $COURSE;
                $mform    =& $this->_form;
-               $renderer =& $mform->defaultRenderer();
 
 //-------------------------------------------------------------------------------
         $mform->addElement('header', 'general', get_string('general', 'form'));
@@ -151,7 +150,7 @@ class glossary_mod_form extends moodleform_mod {
         $buttonarray[] = &$mform->createElement('reset', 'resetbutton', get_string('revert'));
         $buttonarray[] = &$mform->createElement('cancel');
         $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false);
-               $renderer->addStopFieldsetElements('buttonar');
+               $mform->closeHeaderBefore('buttonar');
        }
 
        function definition_after_data(){
index f9ef48fae1fabc8324aa2956eeccd85b83b013f9..137f2d12086d446450a93d2375dc3c09ff6d86d0 100644 (file)
@@ -7,7 +7,6 @@ class journal_mod_form extends moodleform_mod {
 
                global $COURSE;
                $mform    =& $this->_form;
-               $renderer =& $mform->defaultRenderer();
 
 //-------------------------------------------------------------------------------
         $mform->addElement('header', 'general', get_string('general', 'form'));
@@ -51,7 +50,7 @@ class journal_mod_form extends moodleform_mod {
         $buttonarray[] = &$mform->createElement('reset', 'resetbutton', get_string('revert'));
         $buttonarray[] = &$mform->createElement('cancel');
         $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false);
-               $renderer->addStopFieldsetElements('buttonar');
+               $mform->closeHeaderBefore('buttonar');
        }
 
 
index a70bceb3bb6f5641b89e18df1377ec509d8914ed..48069acd814a5e66ffaeee9c6b4745f925f74dbf 100644 (file)
@@ -6,7 +6,6 @@ class label_mod_form extends moodleform_mod {
        function definition() {
 
                $mform    =& $this->_form;
-               $renderer =& $mform->defaultRenderer();
 
                $mform->addElement('htmleditor', 'content', get_string('labeltext', 'label'));
                $mform->setType('content', PARAM_RAW);
@@ -21,7 +20,7 @@ class label_mod_form extends moodleform_mod {
         $buttonarray[] = &$mform->createElement('reset', 'resetbutton', get_string('revert'));
         $buttonarray[] = &$mform->createElement('cancel');
         $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false);
-               $renderer->addStopFieldsetElements('buttonar');
+               $mform->closeHeaderBefore('buttonar');
        }
 
 }
index 0abe84e31d5c10b35e0b1ecc5d08db55ce43820d..3f340e159b29e432995ebeb3334428514b2a458c 100644 (file)
@@ -16,7 +16,6 @@ class lesson_mod_form extends moodleform_mod {
 
                global $LESSON_NEXTPAGE_ACTION, $COURSE;
                $mform    =& $this->_form;
-               $renderer =& $mform->defaultRenderer();
 
 //-------------------------------------------------------------------------------
         $mform->addElement('header', 'general', get_string('general', 'form'));
@@ -280,7 +279,7 @@ class lesson_mod_form extends moodleform_mod {
         $buttonarray[] = &$mform->createElement('reset', 'resetbutton', get_string('revert'));
         $buttonarray[] = &$mform->createElement('cancel');
         $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false);
-               $renderer->addStopFieldsetElements('buttonar');
+               $mform->closeHeaderBefore('buttonar');
        }