Minor - format code

pull/2487/head
jmontoyaa 8 years ago
parent 39ddda3b43
commit bf3f4b12c6
  1. 2
      main/inc/lib/pear/HTML/QuickForm/Renderer/Default.php
  2. 4
      main/inc/lib/pear/HTML/QuickForm/group.php
  3. 6
      main/inc/lib/pear/HTML/QuickForm/radio.php
  4. 3
      main/survey/ch_yesno.php
  5. 2
      main/survey/fillsurvey.php

@ -370,7 +370,6 @@ class HTML_QuickForm_Renderer_Default extends HTML_QuickForm_Renderer
$required, $required,
$error $error
); );
$this->_html .= str_replace('{element}', $element->toHtml(), $html); $this->_html .= str_replace('{element}', $element->toHtml(), $html);
} elseif (!empty($this->_groupElementTemplate)) { } elseif (!empty($this->_groupElementTemplate)) {
$html = str_replace('{label}', $element->getLabel(), $this->_groupElementTemplate); $html = str_replace('{label}', $element->getLabel(), $this->_groupElementTemplate);
@ -382,7 +381,6 @@ class HTML_QuickForm_Renderer_Default extends HTML_QuickForm_Renderer
$html = preg_replace("/([ \t\n\r]*)?<!-- BEGIN required -->.*<!-- END required -->([ \t\n\r]*)?/isU", '', $html); $html = preg_replace("/([ \t\n\r]*)?<!-- BEGIN required -->.*<!-- END required -->([ \t\n\r]*)?/isU", '', $html);
} }
$this->_groupElements[] = str_replace('{element}', $element->toHtml(), $html); $this->_groupElements[] = str_replace('{element}', $element->toHtml(), $html);
} else { } else {
$this->_groupElements[] = $element->toHtml(); $this->_groupElements[] = $element->toHtml();
} }

@ -394,7 +394,7 @@ class HTML_QuickForm_group extends HTML_QuickForm_element
* @access public * @access public
* @return void * @return void
*/ */
function accept(&$renderer, $required = false, $error = null) public function accept(&$renderer, $required = false, $error = null)
{ {
$this->_createElementsIfNotExist(); $this->_createElementsIfNotExist();
$renderer->startGroup($this, $required, $error); $renderer->startGroup($this, $required, $error);
@ -404,6 +404,7 @@ class HTML_QuickForm_group extends HTML_QuickForm_element
if ($this->_appendName) { if ($this->_appendName) {
$elementName = $element->getName(); $elementName = $element->getName();
if (isset($elementName)) { if (isset($elementName)) {
$element->setName($name . '['. (strlen($elementName)? $elementName: $key) .']'); $element->setName($name . '['. (strlen($elementName)? $elementName: $key) .']');
} else { } else {
@ -412,7 +413,6 @@ class HTML_QuickForm_group extends HTML_QuickForm_element
} }
$required = !$element->isFrozen() && in_array($element->getName(), $this->_required); $required = !$element->isFrozen() && in_array($element->getName(), $this->_required);
$element->accept($renderer, $required); $element->accept($renderer, $required);
// restore the element's name // restore the element's name

@ -1,5 +1,4 @@
<?php <?php
/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
/** /**
* HTML class for a radio type element * HTML class for a radio type element
@ -140,11 +139,10 @@ class HTML_QuickForm_radio extends HTML_QuickForm_input
$this->_text . $this->_text .
'</label>&nbsp;&nbsp; '</label>&nbsp;&nbsp;
</div>'; </div>';
return $label;
return $label;
} }
return HTML_QuickForm_input::toHtml() . $label; return HTML_QuickForm_input::toHtml().$label;
} }
/** /**

@ -53,10 +53,9 @@ class ch_yesno extends survey_question
public function render(FormValidator $form, $questionData = array(), $answers = null) public function render(FormValidator $form, $questionData = array(), $answers = null)
{ {
if (is_array($questionData['options'])) { if (is_array($questionData['options'])) {
$class = 'radio-inline';
if ($questionData['display'] == 'vertical') { if ($questionData['display'] == 'vertical') {
$class = 'radio'; $class = 'radio';
} else {
$class = 'radio-inline';
} }
$name = 'question'.$questionData['question_id']; $name = 'question'.$questionData['question_id'];

@ -1211,8 +1211,6 @@ if (isset($questions) && is_array($questions)) {
$form->addHtml('<div class="survey_question '.$ch_type.'">'); $form->addHtml('<div class="survey_question '.$ch_type.'">');
//$form->addHtml('<div class="survey_question_wrapper"><div class="survey_question">'); //$form->addHtml('<div class="survey_question_wrapper"><div class="survey_question">');
$form->addHtml('<h5 class="title">'.$question['sort'].'. '.strip_tags($question['survey_question']).'</h5>'); $form->addHtml('<h5 class="title">'.$question['sort'].'. '.strip_tags($question['survey_question']).'</h5>');
//$form->addHtml($question['survey_question']);
$userAnswerData = SurveyUtil::get_answers_of_question_by_user($question['survey_id'], $question['question_id']); $userAnswerData = SurveyUtil::get_answers_of_question_by_user($question['survey_id'], $question['question_id']);
$finalAnswer = null; $finalAnswer = null;

Loading…
Cancel
Save