@@ -250,8 +250,9 @@ discard block |
||
250 | 250 | */ |
251 | 251 | public function addItemInToolbar($caption,$icon=NULL,$callback=NULL){ |
252 | 252 | $result=$this->addInToolbar($caption,$callback); |
253 | - if(isset($icon) && method_exists($result, "addIcon")) |
|
254 | - $result->addIcon($icon); |
|
253 | + if(isset($icon) && method_exists($result, "addIcon")) { |
|
254 | + $result->addIcon($icon); |
|
255 | + } |
|
255 | 256 | return $result; |
256 | 257 | } |
257 | 258 | |
@@ -265,7 +266,7 @@ discard block |
||
265 | 266 | foreach ($items as $icon=>$item){ |
266 | 267 | $this->addItemInToolbar($item,$icon,$callback); |
267 | 268 | } |
268 | - }else{ |
|
269 | + } else{ |
|
269 | 270 | foreach ($items as $item){ |
270 | 271 | $this->addItemInToolbar($item,null,$callback); |
271 | 272 | } |
@@ -416,8 +417,9 @@ discard block |
||
416 | 417 | protected function _compileForm(){ |
417 | 418 | if(isset($this->_form)){ |
418 | 419 | $noValidate=""; |
419 | - if(\sizeof($this->_form->getValidationParams())>0) |
|
420 | - $noValidate="novalidate"; |
|
420 | + if(\sizeof($this->_form->getValidationParams())>0) { |
|
421 | + $noValidate="novalidate"; |
|
422 | + } |
|
421 | 423 | $this->wrapContent("<form class='ui form' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">","</form>"); |
422 | 424 | } |
423 | 425 | } |