Some minor internal fixes

This commit is contained in:
Deon George
2014-10-08 23:20:27 +11:00
parent 6d914ff290
commit fc5cea470a
5 changed files with 30 additions and 11 deletions

View File

@@ -22,6 +22,9 @@ abstract class lnApp_Form extends Kohana_Form {
return '%s';
}
if (! isset($attributes['class']))
$attributes['class'] = 'form-control';
$output = '';
$output .= '<div class="form-group">';
@@ -43,9 +46,9 @@ abstract class lnApp_Form extends Kohana_Form {
}
$classdiv = FALSE;
if (isset($attributes['class'])) {
$output .= sprintf('<div class="%s">',$attributes['class']);
unset($attributes['class']);
if (isset($attributes['divclass'])) {
$output .= sprintf('<div class="%s">',$attributes['divclass']);
unset($attributes['divclass']);
$classdiv = TRUE;
}
@@ -84,7 +87,7 @@ abstract class lnApp_Form extends Kohana_Form {
* @usedby Form::image
*/
public static function input($name,$value=NULL,array $attributes=NULL) {
return (isset($attributes['type']) AND $attributes['type'] == 'hidden') ? parent::input($name,$value,$attributes) : sprintf(self::_controlgroup($name,$attributes),parent::input($name,$value,Arr::merge($attributes,array('class'=>'form-control'))));
return (isset($attributes['type']) AND $attributes['type'] == 'hidden') ? parent::input($name,$value,$attributes) : sprintf(self::_controlgroup($name,$attributes),parent::input($name,$value,$attributes));
}
public static function select($name,array $options=NULL,$selected=NULL,array $attributes=NULL) {