mirror of
https://github.com/laravel/laravel.git
synced 2025-02-20 11:53:14 +08:00
Merge branch 'develop' of github.com:taylorotwell/laravel into develop
This commit is contained in:
commit
34387fc4e9
@ -2,6 +2,13 @@
|
|||||||
|
|
||||||
class Form {
|
class Form {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Stores labels names.
|
||||||
|
*
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
private static $labels = array();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Open a HTML form.
|
* Open a HTML form.
|
||||||
*
|
*
|
||||||
@ -46,6 +53,16 @@ class Form {
|
|||||||
return $html.PHP_EOL;
|
return $html.PHP_EOL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Close a HTML form.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public static function close()
|
||||||
|
{
|
||||||
|
return '</form>'.PHP_EOL;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Generate a hidden field containing the current CSRF token.
|
* Generate a hidden field containing the current CSRF token.
|
||||||
*
|
*
|
||||||
@ -71,6 +88,21 @@ class Form {
|
|||||||
return Session::get('csrf_token');
|
return Session::get('csrf_token');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a HTML label element.
|
||||||
|
*
|
||||||
|
* @param string $name
|
||||||
|
* @param string $value
|
||||||
|
* @param array $attributes
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
public static function label($name, $value, $attributes = array())
|
||||||
|
{
|
||||||
|
static::$labels[] = $name;
|
||||||
|
|
||||||
|
return '<label for="'.$name.'"'.HTML::attributes($attributes).'>'.HTML::entities($value).'</label>'.PHP_EOL;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a HTML text input element.
|
* Create a HTML text input element.
|
||||||
*
|
*
|
||||||
@ -189,6 +221,8 @@ class Form {
|
|||||||
{
|
{
|
||||||
$attributes['checked'] = 'checked';
|
$attributes['checked'] = 'checked';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
(in_array($name, static::$labels)) ? $attributes['id'] = $name : null;
|
||||||
|
|
||||||
return static::input($type, $name, $value, $attributes);
|
return static::input($type, $name, $value, $attributes);
|
||||||
}
|
}
|
||||||
@ -204,6 +238,7 @@ class Form {
|
|||||||
public static function textarea($name, $value = '', $attributes = array())
|
public static function textarea($name, $value = '', $attributes = array())
|
||||||
{
|
{
|
||||||
$attributes['name'] = $name;
|
$attributes['name'] = $name;
|
||||||
|
(in_array($name, static::$labels)) ? $attributes['id'] = $name : null;
|
||||||
|
|
||||||
// -------------------------------------------------------
|
// -------------------------------------------------------
|
||||||
// Set the default number of rows.
|
// Set the default number of rows.
|
||||||
@ -236,6 +271,7 @@ class Form {
|
|||||||
public static function select($name, $options = array(), $selected = null, $attributes = array())
|
public static function select($name, $options = array(), $selected = null, $attributes = array())
|
||||||
{
|
{
|
||||||
$attributes['name'] = $name;
|
$attributes['name'] = $name;
|
||||||
|
(in_array($name, static::$labels)) ? $attributes['id'] = $name : null;
|
||||||
|
|
||||||
$html_options = array();
|
$html_options = array();
|
||||||
|
|
||||||
@ -265,6 +301,7 @@ class Form {
|
|||||||
$attributes['type'] = $type;
|
$attributes['type'] = $type;
|
||||||
$attributes['name'] = $name;
|
$attributes['name'] = $name;
|
||||||
$attributes['value'] = $value;
|
$attributes['value'] = $value;
|
||||||
|
(in_array($name, static::$labels)) ? $attributes['id'] = $name : null;
|
||||||
|
|
||||||
return '<input'.HTML::attributes($attributes).' />'.PHP_EOL;
|
return '<input'.HTML::attributes($attributes).' />'.PHP_EOL;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user