deon/lnapp
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated font-awesome and bootstrap

Browse Source
This commit is contained in:
Deon George
2014-09-08 23:42:05 +10:00
parent 05d132c4be
commit 85150c655c
166 changed files with 6994 additions and 19909 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
classes/lnApp/Form.php
View File

@@ -16,6 +16,7 @@ abstract class lnApp_Form extends Kohana_Form {
* @return array((string) control group wrapper,(array) attributes to exclude
*/
private static function _controlgroup($name,array &$attributes=NULL) {
// Bypass this rendering if nocg is set.
if (isset($attributes['nocg'])) {
unset($attributes['nocg']);
return '%s';
@@ -23,10 +24,11 @@ abstract class lnApp_Form extends Kohana_Form {
$output = '';
$output .= '<div class="control-group">';
$output .= '<div class="form-group">';
// Only need col-md for horizonal forms?
if (isset($attributes['label'])) {
$output .= Form::label($name,$attributes['label'],array('class'=>'control-label'));
$output .= Form::label($name,$attributes['label'],array('class'=>'col-md-2 control-label'));
unset($attributes['label']);
}
@@ -40,17 +42,25 @@ abstract class lnApp_Form extends Kohana_Form {
unset($attributes['add-on']);
}
$output .= '<div class="controls">';
$classdiv = FALSE;
if (isset($attributes['class'])) {
$output .= sprintf('<div class="%s">',$attributes['class']);
unset($attributes['class']);
$classdiv = TRUE;
}
$output .= '%s';
if ($classdiv)
$output .= '</div>';
if (isset($help))
$output .= sprintf('<span class="help-block">%s</span>',$help);
if (isset($addon))
$output .= sprintf('<span class="add-on">%s</span>',$addon);
$output .= sprintf('<span class="input-group-addon">%s</span>',$addon);
$output .= '</div>';
$output .= '</div>';
return $output;
}
@@ -71,7 +81,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,$attributes));
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'))));
}
public static function select($name,array $options=NULL,$selected=NULL,array $attributes=NULL) {