Skip to content

helpにタグ属性を渡せるように修正 #255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 16, 2016
Merged

helpにタグ属性を渡せるように修正 #255

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11262a7
helpにタグ属性を渡せるように修正
s-nakajima Jun 16, 2016
7a37295
helpにタグ属性を渡せるように修正
s-nakajima Jun 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions View/Helper/NetCommonsFormHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,9 @@ public function input($fieldName, $options = array()) {
$help = Hash::get($options, 'help', false);
$options = Hash::remove($options, 'help');

$helpOptions = Hash::get($options, 'helpOptions', null);
$options = Hash::remove($options, 'helpOptions');

$type = Hash::get($options, 'type', 'text');
$inputOptions = $this->_inputOptions($type, $options);

Expand Down Expand Up @@ -443,7 +446,7 @@ public function input($fieldName, $options = array()) {
}

//ヘルプブロックの追加
$input .= $this->help($help);
$input .= $this->help($help, $helpOptions);

//error出力
if (is_array($options['error'])) {
Expand Down Expand Up @@ -629,15 +632,17 @@ public function error($fieldName, $text = null, $options = array()) {
* ```
*
* @param string $helpText ヘルプテキスト
* @param array|null $helpOptions ヘルプテキストのオプション
* @return string
*/
public function help($helpText) {
public function help($helpText, $helpOptions = null) {
$output = '';

if (! $helpOptions) {
$helpOptions = array('class' => 'help-block', 'escape' => false);
}
if ($helpText) {
$output .= '<div class="help-block">';
$output .= $helpText;
$output .= '</div>';
$output .= $this->NetCommonsHtml->div(null, $helpText, $helpOptions);
}

return $output;
Expand Down