From 066680f0b6516473179d5f6b2640585fa7c920fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20H=C3=A4rtl?= <haertl.mike@gmail.com>
Date: Mon, 29 Sep 2014 13:24:35 +0200
Subject: [PATCH 1/2] Issue 5160: Update advanced app to use bootstrap
 ActiveForm

---
 apps/advanced/backend/views/site/login.php                    | 4 ++--
 apps/advanced/frontend/views/site/contact.php                 | 4 ++--
 apps/advanced/frontend/views/site/login.php                   | 4 ++--
 .../frontend/views/site/requestPasswordResetToken.php         | 4 ++--
 apps/advanced/frontend/views/site/resetPassword.php           | 4 ++--
 apps/advanced/frontend/views/site/signup.php                  | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/apps/advanced/backend/views/site/login.php b/apps/advanced/backend/views/site/login.php
index aad55b818f..a4041a9631 100644
--- a/apps/advanced/backend/views/site/login.php
+++ b/apps/advanced/backend/views/site/login.php
@@ -1,9 +1,9 @@
 <?php
 use yii\helpers\Html;
-use yii\widgets\ActiveForm;
+use yii\bootstrap\ActiveForm;
 
 /* @var $this yii\web\View */
-/* @var $form yii\widgets\ActiveForm */
+/* @var $form yii\bootstrap\ActiveForm */
 /* @var $model \common\models\LoginForm */
 
 $this->title = 'Login';
diff --git a/apps/advanced/frontend/views/site/contact.php b/apps/advanced/frontend/views/site/contact.php
index b37693c219..60bddd3ff3 100644
--- a/apps/advanced/frontend/views/site/contact.php
+++ b/apps/advanced/frontend/views/site/contact.php
@@ -1,10 +1,10 @@
 <?php
 use yii\helpers\Html;
-use yii\widgets\ActiveForm;
+use yii\bootstrap\ActiveForm;
 use yii\captcha\Captcha;
 
 /* @var $this yii\web\View */
-/* @var $form yii\widgets\ActiveForm */
+/* @var $form yii\bootstrap\ActiveForm */
 /* @var $model \frontend\models\ContactForm */
 
 $this->title = 'Contact';
diff --git a/apps/advanced/frontend/views/site/login.php b/apps/advanced/frontend/views/site/login.php
index 890eddff9e..647e04bdce 100644
--- a/apps/advanced/frontend/views/site/login.php
+++ b/apps/advanced/frontend/views/site/login.php
@@ -1,9 +1,9 @@
 <?php
 use yii\helpers\Html;
-use yii\widgets\ActiveForm;
+use yii\bootstrap\ActiveForm;
 
 /* @var $this yii\web\View */
-/* @var $form yii\widgets\ActiveForm */
+/* @var $form yii\bootstrap\ActiveForm */
 /* @var $model \common\models\LoginForm */
 
 $this->title = 'Login';
diff --git a/apps/advanced/frontend/views/site/requestPasswordResetToken.php b/apps/advanced/frontend/views/site/requestPasswordResetToken.php
index 13e6901ff5..fa5055c66a 100644
--- a/apps/advanced/frontend/views/site/requestPasswordResetToken.php
+++ b/apps/advanced/frontend/views/site/requestPasswordResetToken.php
@@ -1,9 +1,9 @@
 <?php
 use yii\helpers\Html;
-use yii\widgets\ActiveForm;
+use yii\bootstrap\ActiveForm;
 
 /* @var $this yii\web\View */
-/* @var $form yii\widgets\ActiveForm */
+/* @var $form yii\bootstrap\ActiveForm */
 /* @var $model \frontend\models\PasswordResetRequestForm */
 
 $this->title = 'Request password reset';
diff --git a/apps/advanced/frontend/views/site/resetPassword.php b/apps/advanced/frontend/views/site/resetPassword.php
index 4efb28a915..45461d032f 100644
--- a/apps/advanced/frontend/views/site/resetPassword.php
+++ b/apps/advanced/frontend/views/site/resetPassword.php
@@ -1,9 +1,9 @@
 <?php
 use yii\helpers\Html;
-use yii\widgets\ActiveForm;
+use yii\bootstrap\ActiveForm;
 
 /* @var $this yii\web\View */
-/* @var $form yii\widgets\ActiveForm */
+/* @var $form yii\bootstrap\ActiveForm */
 /* @var $model \frontend\models\ResetPasswordForm */
 
 $this->title = 'Reset password';
diff --git a/apps/advanced/frontend/views/site/signup.php b/apps/advanced/frontend/views/site/signup.php
index a0fb685346..cdf0143d86 100644
--- a/apps/advanced/frontend/views/site/signup.php
+++ b/apps/advanced/frontend/views/site/signup.php
@@ -1,9 +1,9 @@
 <?php
 use yii\helpers\Html;
-use yii\widgets\ActiveForm;
+use yii\bootstrap\ActiveForm;
 
 /* @var $this yii\web\View */
-/* @var $form yii\widgets\ActiveForm */
+/* @var $form yii\bootstrap\ActiveForm */
 /* @var $model \frontend\models\SignupForm */
 
 $this->title = 'Signup';

From 33813b64a773dbcbabf857e0923e337616b3ab09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20H=C3=A4rtl?= <haertl.mike@gmail.com>
Date: Mon, 29 Sep 2014 13:18:59 +0200
Subject: [PATCH 2/2] Issue 5160: Update base app to use bootstrap ActiveForm

---
 apps/basic/views/site/contact.php | 4 ++--
 apps/basic/views/site/login.php   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/basic/views/site/contact.php b/apps/basic/views/site/contact.php
index fad2d7cedc..e964a34261 100644
--- a/apps/basic/views/site/contact.php
+++ b/apps/basic/views/site/contact.php
@@ -1,10 +1,10 @@
 <?php
 use yii\helpers\Html;
-use yii\widgets\ActiveForm;
+use yii\bootstrap\ActiveForm;
 use yii\captcha\Captcha;
 
 /* @var $this yii\web\View */
-/* @var $form yii\widgets\ActiveForm */
+/* @var $form yii\bootstrap\ActiveForm */
 /* @var $model app\models\ContactForm */
 
 $this->title = 'Contact';
diff --git a/apps/basic/views/site/login.php b/apps/basic/views/site/login.php
index df0c812aa7..916be9808d 100644
--- a/apps/basic/views/site/login.php
+++ b/apps/basic/views/site/login.php
@@ -1,9 +1,9 @@
 <?php
 use yii\helpers\Html;
-use yii\widgets\ActiveForm;
+use yii\bootstrap\ActiveForm;
 
 /* @var $this yii\web\View */
-/* @var $form yii\widgets\ActiveForm */
+/* @var $form yii\bootstrap\ActiveForm */
 /* @var $model app\models\LoginForm */
 
 $this->title = 'Login';