Fix form UI.

main/admin/user_edit.php

@@ -265,7 +265,7 @@ $form->addGroup($group, 'mail', get_lang('SendMailToNewUser'), ' ', false);
 // Registration User and Date
 $creatorInfo = api_get_user_info($user_data['creator_id']);
 $date = sprintf(get_lang('CreatedByXYOnZ'), 'user_information.php?user_id='.$user_data['creator_id'], $creatorInfo['username'], $user_data['registration_date']);
-$form->addElement('html', '<div class="control-group"><label class="control-label">'.get_lang('RegistrationDate').'</label><div class="controls">'.$date.'</div></div>');
+$form->addElement('label', get_lang('RegistrationDate'), $date);
 
 if (!$user_data['platform_admin']) {
 	// Expiration Date

main/css/base.css

@@ -2409,10 +2409,10 @@ div.admin_section h4 {
     margin-bottom:5px;
     clear: both;
 }
-.question-list-description-block {
+/*.question-list-description-block {
     margin-bottom:10px !important;
     margin-top: -6px !important;
-}
+}*/
 
 .thematic_advance_content {
     padding:10px;

main/exercice/admin.php

@@ -521,7 +521,7 @@ if (isset($_GET['message'])) {
 }
 
 if ($newQuestion || $editQuestion) {
-    // statement management
+    // Question management
     $type = isset($_REQUEST['answerType']) ? Security::remove_XSS($_REQUEST['answerType']) : null;
     echo '<input type="hidden" name="Type" value="'.$type.'" />';
 

main/exercice/calculated_answer.class.php

@@ -89,7 +89,7 @@ class CalculatedAnswer extends Question
                     var answer = e.editor.getData();
                 }
                 var blanks = answer.match(/\[[^\]]*\]/g);
-                var fields = "<div class=\"control-group\"><label class=\"control-label\">'.get_lang('VariableRanges').'</label><div class=\"controls\"><table>";
+                var fields = "<div class=\"form-group\"><label class=\"col-sm-2\">'.get_lang('VariableRanges').'</label><div class=\"col-sm-8\"><table>";
                 if (blanks!=null) {
                     if (typeof updateBlanks.randomValues === "undefined") {
                         updateBlanks.randomValues = [];
@@ -120,7 +120,15 @@ class CalculatedAnswer extends Question
 
         // answer
         $form->addElement('label', null, '<br /><br />'.get_lang('TypeTextBelow').', '.get_lang('And').' '.get_lang('UseTagForBlank'));
-        $form->addElement('html_editor', 'answer', '<img src="../img/fill_field.png">','id="answer" cols="122" rows="6" onkeyup="javascript: updateBlanks(this);"', array('ToolbarSet' => 'Test_Question_Description', 'Width' => '100%', 'Height' => '350'));
+        $form->addElement(
+            'html_editor',
+            'answer',
+            '<img src="../img/fill_field.png">',
+            array(
+                'id' => 'answer',
+                'onkeyup' => 'javascript: updateBlanks(this);'
+            ),
+            array('ToolbarSet' => 'Test_Question_Description', 'Width' => '100%', 'Height' => '350'));
 
         $form->addRule('answer', get_lang('GiveText'),'required');
         $form->addRule('answer', get_lang('DefineBlanks'),'regex','/\[.*\]/');
@@ -137,11 +145,8 @@ class CalculatedAnswer extends Question
             )
         );
         $form->addElement(
-            'html',
-            '<div class="control-group">
-                <label class="control-label"></label>
-                <div class="controls">'.$notationListButton.'</div>
-            </div>');
+            'label', null,
+            $notationListButton);
 
         $form->addElement('label', null, get_lang('FormulaExample'));
 

main/exercice/fill_blanks.class.php

@@ -90,14 +90,14 @@ class FillBlanks extends Question
                 }
 
                 var blanks = answer.match(/\[[^\]]*\]/g);
-                var fields = "<div class=\"control-group\"><label class=\"control-label\">'.get_lang('Weighting').'</label><div class=\"controls\"><table>";
+                var fields = "<div class=\"form-group\"><label class=\" col-sm-2 control-label\">'.get_lang('Weighting').'</label><div class=\"col-sm-8\"><table>";
                 if (blanks!=null) {
                     for (i=0 ; i<blanks.length ; i++){
                         if (document.getElementById("weighting["+i+"]"))
                             value = document.getElementById("weighting["+i+"]").value;
                         else
                             value = "10";
-                        fields += "<tr><td><label>"+blanks[i]+"</label></td><td><input style=\"margin-left: 0em;\" size=\"5\" value=\""+value+"\" type=\"text\" id=\"weighting["+i+"]\" name=\"weighting["+i+"]\" /></td></tr>";
+                        fields += "<tr><td><label>"+blanks[i]+"</label></td><td><input class=\"form-control\"style=\"margin-left: 0em;\" size=\"5\" value=\""+value+"\" type=\"text\" id=\"weighting["+i+"]\" name=\"weighting["+i+"]\" /></td></tr>";
                     }
                 }
                 document.getElementById("blanks_weighting").innerHTML = fields + "</table></div></div>";
@@ -112,7 +112,15 @@ class FillBlanks extends Question
 
 		// answer
 		$form->addElement('label', null, '<br /><br />'.get_lang('TypeTextBelow').', '.get_lang('And').' '.get_lang('UseTagForBlank'));
-		$form->addElement('html_editor', 'answer', '<img src="../img/fill_field.png">','id="answer" cols="122" rows="6" onkeyup="javascript: updateBlanks(this);"', array('ToolbarSet' => 'TestQuestionDescription', 'Width' => '100%', 'Height' => '350'));
+		$form->addElement(
+            'html_editor',
+            'answer',
+            '<img src="../img/fill_field.png">',
+            array(
+                'id' => 'answer',
+                'onkeyup' => '"javascript: updateBlanks(this);"'
+            ),
+            array('ToolbarSet' => 'TestQuestionDescription', 'Height' => '350'));
 
 		$form->addRule('answer', get_lang('GiveText'),'required');
 		$form->addRule('answer', get_lang('DefineBlanks'),'regex','/\[.*\]/');
@@ -124,7 +132,6 @@ class FillBlanks extends Question
 
 		global $text, $class;
 		// setting the save button here and not in the question class.php
-		//$form->addElement('style_submit_button', 'submitQuestion', $text, 'class="'.$class.'"');
         $form->addButtonSave($text, 'submitQuestion');
 
 		if (!empty($this->id)) {

main/exercice/global_multiple_answer.class.php

@@ -109,10 +109,10 @@ class GlobalMultipleAnswer extends Question
             $form->addElement('checkbox', 'correct[' . $i . ']', null, null, 'class="checkbox"');
             $boxes_names[] = 'correct[' . $i . ']';
 
-            $form->addElement('html_editor', 'answer[' . $i . ']', null, 'style="vertical-align:middle"', array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
+            $form->addElement('html_editor', 'answer[' . $i . ']', null, array(), array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
             $form->addRule('answer[' . $i . ']', get_lang('ThisFieldIsRequired'), 'required');
 
-            $form->addElement('html_editor', 'comment[' . $i . ']', null, 'style="vertical-align:middle"', array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
+            $form->addElement('html_editor', 'comment[' . $i . ']', null, array(), array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
 
             $form->addElement('html', '</tr>');
         }

main/exercice/hotspot.class.php

@@ -36,12 +36,13 @@ class HotSpot extends Question
 			// setting the save button here and not in the question class.php
 			// Saving a question
 			$form->addElement('style_submit_button','submitQuestion',get_lang('GoToQuestion'), 'class="'.$class.'"');
+			//$form->addButtonSave(get_lang('GoToQuestion'), 'submitQuestion');
 			$form->addRule('imageUpload', get_lang('OnlyImagesAllowed'), 'filetype', array ('jpg', 'jpeg', 'png', 'gif'));
 			$form->addRule('imageUpload', get_lang('NoImage'), 'uploadedfile');
 		} else {
 			// setting the save button here and not in the question class.php
 			// Editing a question
-			$form->addElement('style_submit_button','submitQuestion',get_lang('ModifyExercise'), 'class="'.$class.'"');
+			$form->addButtonUpdate(get_lang('ModifyExercise'), 'submitQuestion');
 		}
 	}
 

main/exercice/matching.class.php

@@ -113,7 +113,7 @@ class Matching extends Question
             $puce->freeze();
             $group[] = $puce;
 
-            $group[] = $form->createElement('text', 'answer['.$i.']',null, 'size="60" style="margin-left: 0em;"');
+            $group[] = $form->createElement('text', 'answer['.$i.']',null);
             $group[] = $form->createElement('select', 'matches['.$i.']',null,$a_matches);
             $group[] = $form->createElement('text', 'weighting['.$i.']',null, array('class' => 'span1', 'value' => 10));
             $form -> addGroup($group, null, null, '</td><td>');

main/exercice/multiple_answer.class.php

@@ -109,10 +109,10 @@ class MultipleAnswer extends Question
 			$form->addElement('checkbox', 'correct['.$i.']', null, null, 'class="checkbox" style="margin-left: 0em;"');
 			$boxes_names[] = 'correct['.$i.']';
 
-			$form->addElement('html_editor', 'answer['.$i.']',null, 'style="vertical-align:middle"', array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
+			$form->addElement('html_editor', 'answer['.$i.']',null, array(), array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
 			$form->addRule('answer['.$i.']', get_lang('ThisFieldIsRequired'), 'required');
 
-				$form->addElement('html_editor', 'comment['.$i.']',null, 'style="vertical-align:middle"', array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
+				$form->addElement('html_editor', 'comment['.$i.']',null, array(), array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
 
 			$form->addElement('text', 'weighting['.$i.']',null, array('class' => "span1", 'value' => '0'));
 			$form -> addElement ('html', '</tr>');
@@ -122,23 +122,14 @@ class MultipleAnswer extends Question
 
 		$form -> add_multiple_required_rule ($boxes_names , get_lang('ChooseAtLeastOneCheckbox') , 'multiple_required');
 
-
-		$navigator_info = api_get_navigator();
-
 		global $text, $class;
 		if ($obj_ex->edit_exercise_in_lp == true) {
-			//ie6 fix
-			if ($navigator_info['name']=='Internet Explorer' &&  $navigator_info['version']=='6') {
-                $form->addElement('submit', 'lessAnswers', get_lang('LessAnswer'),'class="btn minus"');
-                $form->addElement('submit', 'moreAnswers', get_lang('PlusAnswer'),'class="btn plus"');
-                $form->addElement('submit','submitQuestion',$text, 'class="'.$class.'"');
-			} else {
-                // setting the save button here and not in the question class.php
-                $form->addElement('style_submit_button', 'lessAnswers', get_lang('LessAnswer'),'class="btn minus"');
-                $form->addElement('style_submit_button', 'moreAnswers', get_lang('PlusAnswer'),'class="btn plus"');
-                $form->addElement('style_submit_button','submitQuestion',$text, 'class="'.$class.'"');
-			}
+			// setting the save button here and not in the question class.php
+			$form->addElement('style_submit_button', 'lessAnswers', get_lang('LessAnswer'),'class="btn minus"');
+			$form->addElement('style_submit_button', 'moreAnswers', get_lang('PlusAnswer'),'class="btn plus"');
+			$form->addElement('style_submit_button','submitQuestion',$text, 'class="'.$class.'"');
 		}
+
 		$renderer->setElementTemplate('{element}&nbsp;','lessAnswers');
 		$renderer->setElementTemplate('{element}&nbsp;','submitQuestion');
 		$renderer->setElementTemplate('{element}&nbsp;','moreAnswers');

main/exercice/multiple_answer_combination.class.php

@@ -99,10 +99,10 @@ class MultipleAnswerCombination extends Question
 			$form->addElement('checkbox', 'correct['.$i.']', null, null, 'class="checkbox" style="margin-left: 0em;"');
 			$boxes_names[] = 'correct['.$i.']';
 
-			$form->addElement('html_editor', 'answer['.$i.']',null, 'style="vertical-align:middle"', array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
+			$form->addElement('html_editor', 'answer['.$i.']',null, array(), array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
 			$form->addRule('answer['.$i.']', get_lang('ThisFieldIsRequired'), 'required');
 
-            $form->addElement('html_editor', 'comment['.$i.']',null, 'style="vertical-align:middle"', array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
+            $form->addElement('html_editor', 'comment['.$i.']',null, array(), array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
 			//only 1 answer the all deal ...
 			//$form->addElement('text', 'weighting['.$i.']',null, 'style="vertical-align:middle;margin-left: 0em;" size="5" value="10"');
 

main/exercice/multiple_answer_true_false.class.php

@@ -121,12 +121,12 @@ class MultipleAnswerTrueFalse extends Question
 			}
 
 			$boxes_names[] = 'correct['.$i.']';
-			$form->addElement('html_editor', 'answer['.$i.']',null, 'style="vertical-align:middle"', array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
+			$form->addElement('html_editor', 'answer['.$i.']',null, array(), array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
 			$form->addRule('answer['.$i.']', get_lang('ThisFieldIsRequired'), 'required');
 
 			// show comment when feedback is enable
 			if ($obj_ex->selectFeedbackType() != EXERCISE_FEEDBACK_TYPE_EXAM) {
-				$form->addElement('html_editor', 'comment['.$i.']',null, 'style="vertical-align:middle"', array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
+				$form->addElement('html_editor', 'comment['.$i.']',null, array(), array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
 			}
 			$form->addElement ('html', '</tr>');
 		}

main/exercice/oral_expression.class.php

@@ -15,7 +15,7 @@ class OralExpression extends Question
 	/**
 	 * Constructor
 	 */
-	function OralExpression()
+	public function __construct()
     {
 		parent::question();
 		$this -> type = ORAL_EXPRESSION;
@@ -23,15 +23,16 @@ class OralExpression extends Question
 	}
 
 	/**
-	 * function which redifines Question::createAnswersForm
-	 * @param $form FormValidator
+	 * function which redefine Question::createAnswersForm
+	 * @param FormValidator $form
 	 */
-	function createAnswersForm ($form)
+	function createAnswersForm($form)
     {
-		$form -> addElement('text','weighting',get_lang('Weighting'), array('class' => 'span1'));
+
+		$form -> addElement('text','weighting', get_lang('Weighting'), array('class' => 'span1'));
 		global $text, $class;
 		// setting the save button here and not in the question class.php
-		$form->addElement('style_submit_button','submitQuestion',$text, 'class="'.$class.'"');
+		$form->addButtonSave($text, 'submitQuestion');
 		if (!empty($this->id)) {
 			$form -> setDefaults(array('weighting' => float_format($this->weighting, 1)));
 		} else {
@@ -43,14 +44,20 @@ class OralExpression extends Question
 
 	/**
 	 * abstract function which creates the form to create / edit the answers of the question
-	 * @param the formvalidator instance
+	 * @param the FormValidator $form
 	 */
 	function processAnswersCreation($form)
     {
-		$this->weighting = $form -> getSubmitValue('weighting');
+		$this->weighting = $form ->getSubmitValue('weighting');
 		$this->save();
 	}
 
+	/**
+	 * @param null $feedback_type
+	 * @param null $counter
+	 * @param null $score
+	 * @return null|string
+	 */
 	function return_header($feedback_type = null, $counter = null, $score = null)
     {
 	    $header = parent::return_header($feedback_type, $counter, $score);

main/exercice/question.class.php

@@ -1289,7 +1289,7 @@ abstract class Question
             //$course_medias = Question::prepare_course_media_select(api_get_course_int_id());
             //$form->addElement('select', 'parent_id', get_lang('AttachToMedia'), $course_medias);
 
-            $form->addElement('html','</div>');
+            $form->addElement('html', '</div>');
         }
 
         if (!isset($_GET['fromExercise'])) {
@@ -1318,10 +1318,10 @@ abstract class Question
 
         // default values
         $defaults = array();
-        $defaults['questionName']           = $this -> question;
-        $defaults['questionDescription']    = $this -> description;
-        $defaults['questionLevel']          = $this -> level;
-        $defaults['questionCategory']       = $this->category;
+        $defaults['questionName'] = $this->question;
+        $defaults['questionDescription'] = $this->description;
+        $defaults['questionLevel'] = $this->level;
+        $defaults['questionCategory'] = $this->category;
 
         //$defaults['questionCategory']       = $this->category_list;
         //$defaults['parent_id']              = $this->parent_id;
@@ -1345,7 +1345,7 @@ abstract class Question
      * @param FormValidator $form
      * @param Exercise $objExercise
      */
-    public function processCreation ($form, $objExercise = null)
+    public function processCreation($form, $objExercise = null)
     {
         //$this->updateParentId($form->getSubmitValue('parent_id'));
         $this->updateTitle($form->getSubmitValue('questionName'));
@@ -1365,13 +1365,13 @@ abstract class Question
 
     /**
      * abstract function which creates the form to create / edit the answers of the question
-     * @param the formvalidator instance
+     * @param the FormValidator instance
      */
     abstract function createAnswersForm ($form);
 
     /**
      * abstract function which process the creation of answers
-     * @param the formvalidator instance
+     * @param the FormValidator instance
      */
     abstract function processAnswersCreation ($form);
 

main/exercice/question_admin.inc.php

@@ -10,7 +10,6 @@
  * 	@version $Id: question_admin.inc.php 22126 2009-07-15 22:38:39Z juliomontoya $
  */
 
-// INIT QUESTION
 if (isset($_GET['editQuestion'])) {
 	$objQuestion = Question::read ($_GET['editQuestion']);
 	$action = api_get_self()."?".api_get_cidreq()."&myid=1&modifyQuestion=".$modifyQuestion."&editQuestion=".$objQuestion->id;

main/exercice/unique_answer.class.php

@@ -85,8 +85,7 @@ class UniqueAnswer extends Question
                     </th>
                 </tr>';
 
-        $form->addElement(
-            'label',
+        $form->addLabel(
             get_lang('Answers') . '<br /> <img src="../img/fill_field.png">',
             $html
         );
@@ -114,9 +113,9 @@ class UniqueAnswer extends Question
                 }
                 $question = Question::read($questionid);
                 $select_question[$questionid] = 'Q' . $key . ' :' . cut(
-                        $question->selectTitle(),
-                        20
-                    );
+                    $question->selectTitle(),
+                    20
+                );
             }
         }
         $select_question[-1] = get_lang('ExitTest');
@@ -215,8 +214,6 @@ class UniqueAnswer extends Question
                 ' value = "' . $i . '"'
             );
             $answer_number->freeze();
-            $form->addHtml('<div class="row">');
-            $form->addHtml('<div class="col-md-1">');
             $form->addElement(
                 'radio',
                 'correct',
@@ -225,10 +222,8 @@ class UniqueAnswer extends Question
                 $i,
                 'class="checkbox"'
             );
-            $form->addHtml('</div>');
-            $form->addHtml('<div class="col-md-5">');
+
             $form->addHtmlEditor('answer[' . $i . ']',null,null,true, $editor_config);
-            $form->addHtml('</div>');
 
             $form->addRule(
                 'answer[' . $i . ']',
@@ -237,9 +232,7 @@ class UniqueAnswer extends Question
             );
 
             if ($obj_ex->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_DIRECT) {
-                $form->addHtml('<div class="col-md-5">');
                 $form->addHtmlEditor('comment[' . $i . ']',null,null,false,$editor_config);
-                $form->addHtml('</div>');
                 // Direct feedback
 
                 //Adding extra feedback fields
@@ -279,11 +272,8 @@ class UniqueAnswer extends Question
                 );
 
             } else {
-                $form->addHtml('<div class="col-md-5">');
                 $form->addHtmlEditor('comment[' . $i . ']',null,null,false,$editor_config);
-                $form->addHtml('</div>');
             }
-            $form->addHtml('</div>');
             $form->addText('weighting[' . $i . ']', null,null, array('class' => "col-md-1", 'value' => '0'));
             $form->addElement('html', '</tr>');
         }

main/exercice/unique_answer_no_option.class.php

@@ -184,9 +184,9 @@ class UniqueAnswerNoOption extends Question
 
 
 			$form->addElement('radio', 'correct', null, null, $i, 'class="checkbox" style="margin-left: 0em;"');
-			$form->addElement('html_editor', 'answer['.$i.']', null, 'style="vertical-align:middle"', $editor_config);
+			$form->addElement('html_editor', 'answer['.$i.']', null, array(), $editor_config);
 
-            $form->addElement('html_editor', 'comment['.$i.']', null, 'style="vertical-align:middle"', $editor_config);
+            $form->addElement('html_editor', 'comment['.$i.']', null, array(), $editor_config);
 			$form->addElement('text', 'weighting['.$i.']', null, array('class' => "span1", 'value' => '0'));
 			$form->addElement('html', '</tr>');
             $i++;
@@ -218,12 +218,12 @@ class UniqueAnswerNoOption extends Question
         $form->addElement('hidden', 'position['.$i.']', '666');
 
         $form->addElement('radio', 'correct', null, null, $i, 'class="checkbox" style="margin-left: 0em;"');
-        $form->addElement('html_editor', 'answer['.$i.']', null, 'style="vertical-align:middle"', $editor_config);
+        $form->addElement('html_editor', 'answer['.$i.']', null, array(), $editor_config);
 
         $form->addRule('answer['.$i.']', get_lang('ThisFieldIsRequired'), 'required');
 
 
-        $form->addElement('html_editor', 'comment['.$i.']', null, 'style="vertical-align:middle"', $editor_config);
+        $form->addElement('html_editor', 'comment['.$i.']', null, array(), $editor_config);
 
         //$form->addElement('select', 'destination'.$i, get_lang('SelectQuestion').' : ',$select_question,'multiple');
 

main/inc/lib/pear/HTML/QuickForm/Renderer/Default.php

@@ -283,8 +283,6 @@ class HTML_QuickForm_Renderer_Default extends HTML_QuickForm_Renderer
                 $template = $this->getForm()->getDefaultElementTemplate();
             }
             $html = str_replace('{label}', $nameLabel, $template);
-            // Default template
-            //$html = str_replace('{label}', $nameLabel, $this->_elementTemplate);
         }
         $html = str_replace('{label-for}', $labelFor, $html);
         $html = str_replace('{icon}', $icon, $html);

main/inc/lib/pear/HTML/QuickForm/advmultiselect.php

@@ -533,11 +533,9 @@ class HTML_QuickForm_advmultiselect extends HTML_QuickForm_select
         } else {
             $this->_elementTemplate = '
 {javascript}
-
   <div class="col-sm-3"><!-- BEGIN label_2 -->{label_2}<!-- END label_2 --> {unselected}</div>
   <div class="col-sm-2"><div class="text-center">{add}{remove}</div></div>
-  <div class="col-sm-3">
-<!-- BEGIN label_3 -->{label_3}<!-- END label_3 -->{selected}</div>
+  <div class="col-sm-3"><!-- BEGIN label_3 -->{label_3}<!-- END label_3 -->{selected}</div>
 
 ';
         }
@@ -545,6 +543,7 @@ class HTML_QuickForm_advmultiselect extends HTML_QuickForm_select
             $this->_elementTemplate = str_replace('{javascript}', '',
                 $this->_elementTemplate);
         }
+
         return $oldTemplate;
     }
 

main/inc/lib/pear/HTML/QuickForm/input.php

@@ -195,12 +195,4 @@ class HTML_QuickForm_input extends HTML_QuickForm_element
             return parent::exportValue($submitValues, $assoc);
         }
     }
-
-    /**
-     * @param string $layout
-     */
-    public function getTemplate($layout)
-    {
-
-    }
 }

main/inc/lib/pear/HTML/QuickForm/label.php

@@ -28,7 +28,7 @@ class HTML_QuickForm_label extends HTML_QuickForm_static
      * @access public
      * @return void
      */
-    function HTML_QuickForm_label(
+    public function __construct(
         $label = null,
         $text = null,
         $attributes = null
@@ -37,29 +37,11 @@ class HTML_QuickForm_label extends HTML_QuickForm_static
         $this->_type = 'html';
     }
 
-    /**
-     * Accepts a renderer
-     *
-     * @param HTML_QuickForm_Renderer    renderer object (only works with Default renderer!)
-     * @access public
-     * @return void
-     */
-    public function accept(&$renderer, $required = false, $error = null)
-    {
-        $renderer->renderHtml($this);
-    }
-
     /**
      * @return string
      */
     public function toHtml()
     {
-        $for = $this->getLabelFor();
-        return
-            '<label class="control-label"' . empty($for) ? '' : ' for="' . $for . '"' . '>' .
-            $this->getLabel() .
-            '</label>
-            ' .
-            parent::toHtml();
+        return parent::toHtml();
     }
 }

main/inc/lib/userportal.lib.php

@@ -705,8 +705,19 @@ class IndexManager
             FormValidator::LAYOUT_BOX_NO_LABEL
         );
 
-        $form->addText('login', get_lang('UserName'), true, array('id' => 'login', 'autofocus' => 'autofocus', 'icon' => 'user'));
-        $form->addElement('password', 'password', get_lang('Pass'), array('id' => 'password', 'icon' => 'lock'));
+        $form->addText(
+            'login',
+            get_lang('UserName'),
+            true,
+            array('id' => 'login', 'autofocus' => 'autofocus', 'icon' => 'user')
+        );
+
+        $form->addElement(
+            'password',
+            'password',
+            get_lang('Pass'),
+            array('id' => 'password', 'icon' => 'lock')
+        );
 
         global $_configuration;