php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-15 05:45:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3285 from mikehaertl/master

Browse Source 
Fix bootstrap templates
This commit is contained in:
Qiang Xue
2014-04-29 08:34:26 -04:00
parent 1ed021809e 9d384668c5
commit d63613b6e9
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
extensions/bootstrap/ActiveField.php
View File

@@ -173,6 +173,9 @@ class ActiveField extends \yii\widgets\ActiveField
} else { } else {
$this->template = "<div class=\"checkbox\">\n{beginLabel}\n{input}\n{labelTitle}\n{endLabel}\n{error}\n{hint}\n</div>"; $this->template = "<div class=\"checkbox\">\n{beginLabel}\n{input}\n{labelTitle}\n{endLabel}\n{error}\n{hint}\n</div>";
} }
} else {
$this->template = $options['template'];
unset($options['template']);
} }
$this->labelOptions['class'] = null; $this->labelOptions['class'] = null;
} }
@@ -189,6 +192,9 @@ class ActiveField extends \yii\widgets\ActiveField
if ($this->inline) { if ($this->inline) {
if (!isset($options['template'])) { if (!isset($options['template'])) {
$this->template = "{label}\n{beginWrapper}\n{input}\n{error}\n{endWrapper}\n{hint}"; $this->template = "{label}\n{beginWrapper}\n{input}\n{error}\n{endWrapper}\n{hint}";
} else {
$this->template = $options['template'];
unset($options['template']);
} }
if (!isset($options['itemOptions'])) { if (!isset($options['itemOptions'])) {
$options['itemOptions'] = [ $options['itemOptions'] = [
@@ -209,6 +215,9 @@ class ActiveField extends \yii\widgets\ActiveField
if ($this->inline) { if ($this->inline) {
if (!isset($options['template'])) { if (!isset($options['template'])) {
$this->template = "{label}\n{beginWrapper}\n{input}\n{error}\n{endWrapper}\n{hint}"; $this->template = "{label}\n{beginWrapper}\n{input}\n{error}\n{endWrapper}\n{hint}";
} else {
$this->template = $options['template'];
unset($options['template']);
} }
if (!isset($options['itemOptions'])) { if (!isset($options['itemOptions'])) {
$options['itemOptions'] = [ $options['itemOptions'] = [