add Vitaliy's widgets

Administrator
1 parent 77092529
Showing 7 changed files with 102 additions and 70 deletions Show diff stats
backend/web/js/option.js
frontend/config/main.php
frontend/controllers/SiteController.php
frontend/models/SignupForm.php
frontend/views/accounts/general.php
frontend/views/site/registration.php
frontend/web/js/selectize.js
@@ -17,14 +17,7 @@ function checkboxerInit() {
         $(value).trigger('change');
     });
 }
-function accountRedraw() {
-    var type = $('input[name="User[type]"]:checked').val();
-    if(type == 2) {
-        $('#form_definition').addClass('form_for_company');
-    } else {
-        $('#form_definition').removeClass('form_for_company');
-    }
-}
+
 $(function() {
     var counter = 0;
     $(document).on('click', '.add_row', function() {
@@ -47,6 +47,7 @@ return [
             'showScriptName' => false,
                 'rules' => [
                     'landing/<view:[\w-]+>' => 'landing/view',
+                    'site/city/<query:[\d]+>' => 'site/city',
                 ]
         ],
     ],
@@ -12,6 +12,7 @@ use frontend\models\ContactForm;
 use frontend\models\Options;
 use frontend\models\OptionValues;
 use yii\base\InvalidParamException;
+use yii\db\Query;
 use yii\web\BadRequestHttpException;
 use yii\web\Controller;
 use yii\filters\VerbFilter;
@@ -48,6 +49,23 @@ class SiteController extends Controller
+    public function actionCity($query){
+            \Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
+            $out = ['results' => ['id' => '', 'text' => '']];
+            if (!is_null($query)) {
+                $query = new Query();
+                $query->select('id, name AS text')
+                    ->from('city')
+                    ->where(['like', 'name', $query])
+                    ->limit(20);
+                $command = $query->createCommand();
+                $data = $command->queryAll();
+                $out['results'] = array_values($data);
+            }
+
+            return $out;
+    }
+
     public function actionFormsModal()
     {
@@ -13,6 +13,10 @@ class SignupForm extends Model
     public $username;
     public $email;
     public $password;
+    public $firstname;
+    public $lastname;
+    public $verifyCode;
+    public $location;
     /**
      * @inheritdoc
@@ -25,12 +29,16 @@ class SignupForm extends Model
             ['username', 'unique', 'targetClass' => '\common\models\User', 'message' => 'This username has already been taken.'],
             ['username', 'string', 'min' => 2, 'max' => 255],
+            ['location', 'string', 'min' => 2, 'max' => 255],
+
             ['email', 'filter', 'filter' => 'trim'],
             ['email', 'required'],
             ['email', 'email'],
             ['email', 'string', 'max' => 255],
             ['email', 'unique', 'targetClass' => '\common\models\User', 'message' => 'This email address has already been taken.'],
+            ['verifyCode', 'captcha'],
+
             ['password', 'required'],
             ['password', 'string', 'min' => 6],
         ];
@@ -70,29 +70,23 @@
     </div>
     <div class="general-who style border-general">
         <div class="general-who-title gen-admin-title">Кто вы:</div>
+
         <?= $form->field ($user, 'type')
-        ->label ('Кто вы')
-        ->radioList ([1 => 'Частное лицо', 2 => 'Компания']);
-        ?>
-
-<!--        --><?//= $form->field ($user, 'type')
-//            ->label (false)
-//            ->radioList (
-//                [1 => 'Male', 0 => 'Female'],
-//                [
-//                    'item' => function($index, $label, $name, $checked, $value) {
-//
-//                        $return = '<label class="modal-radio">';
-//                        $return .= '<input type="radio" name="' . $name . '" value="' . $value . '" tabindex="3">';
-//                        $return .= '<i></i>';
-//                        $return .= '<span>' . ucwords($label) . '</span>';
-//                        $return .= '</label>';
-//
-//                        return $return;
-//                    }
-//                ]
-//            );
-//        ?>
+            ->label (false)
+            ->radioList (
+                [1 => 'Частное лицо', 2 => 'Компания'],
+                [
+                    'item' => function($index, $label, $name, $checked, $value) {
+                        $return = '<label>';
+                        $return .= '<input type="radio" name="' . $name . '" value="' . $value . '" '.($checked ? "checked" :"").' >';
+                        $return .= '<span></span>' . ucwords($label);
+                        $return .= '</label>';
+
+                        return $return;
+                    }
+                ]
+            );
+        ?>
     </div>
@@ -3,7 +3,9 @@
  * @var $user common\models\User
  * @var $user_info common\models\UserInfo
  */
+    use yii\captcha\Captcha;
     use yii\widgets\ActiveForm;
+    $this->registerJsFile('/js/selectize.js');
 ?>
 <div class="section-box content">
     <div class="section-box registration">
@@ -15,13 +17,7 @@
                         <div class="input-blocks-wrapper">
                             <div class="input-blocks">
-                                <?= $form->field($model, 'username')?>
-
-                                <div class="form-group field-accountsform-email require has-erro">
-                                    <label for="input-txt-1">Логин</label>
-                                    <input class="custom-input-2" id="input-txt-1" type="text">
-                                    <div class="help-block">Значение «E-mail (Логин)» не является правильным email адресом.</div>
-                                </div>
+                                <?= $form->field($model, 'username')->textInput(['class'=>'custom-input-2'])?>
                             </div>
                             <div class="input-blocks-help-wr">
                                 <div class="input-blocks-help">Логин должен содержать не менее 3-х символов, начинаться с английской буквы и заканчиваться буквой или цифрой. Допускаются английские буквы, цифры и знаки 'тире', 'подчеркивание', 'точка'</div>
@@ -31,8 +27,7 @@
                         <div class="input-blocks-wrapper">
                             <div class="input-blocks">
-                                <label for="input-txt-2">Пароль</label>
-                                <input class="custom-input-2" id="input-txt-2" type="text">
+                                <?= $form->field($model, 'password')->passwordInput(['class'=>'custom-input-2'])?>
                             </div>
                             <div class="input-blocks-help-wr">
@@ -42,8 +37,7 @@
                         <div class="input-blocks-wrapper">
                             <div class="input-blocks">
-                                <label for="input-txt-3">E-mail</label>
-                                <input class="custom-input-2" id="input-txt-3" type="text">
+                                <?= $form->field($model, 'email')->textInput(['class'=>'custom-input-2'])?>
                             </div>
                             <div class="input-blocks-help-wr">
                                 <div class="input-blocks-help">На этот адрес электронной почты будет отправлено уведомление о регистрации.</div>
@@ -55,6 +49,7 @@
                             <div class="who-you-are-form-wr style">
                                 <div class="who-you-are-form">
                                     <div class="check-radio-wr">
+
                                         <div class="custom-form-buttons">
                                             <input class="custom-radio" id="custom-radio-1" name="group-1" checked="checked" type="radio">
                                             <label for="custom-radio-1"><span></span>Частное лицо copy</label>
@@ -108,15 +103,6 @@
                                                 <option value="5">Черкасы</option>
                                             </select>
                                         </div>
-
-                                        <!--<div class="input-blocks">-->
-                                        <!--<select name="" id="" >-->
-                                        <!--<option selected disabled></option>-->
-                                        <!--<option value="">Киев</option>-->
-                                        <!--<option value="">Киев</option>-->
-                                        <!--<option value="">Киев</option>-->
-                                        <!--</select>-->
-                                        <!--</div>-->
                                     </div>
                                     <div class="input-blocks-wrapper city-two">
@@ -126,18 +112,21 @@
                                         </div>
                                         <div class="form-help-two">Если вашего города нет в списке, введите его. </div>
                                     </div>
-
-                                    <div class="input-blocks-wrapper captcha">
-                                        <div class="input-blocks-captcha">
-                                            <img id="accountsform-verifycode-image" src="/images/captcha.png" alt="">
-                                        </div>
-                                    </div>
-
                                     <div class="input-blocks-wrapper">
-                                        <div class="input-blocks">
-                                            <label for="input-txt-8">Введите проверочный код</label>
-                                            <input class="custom-input-2" id="input-txt-8" type="text">
-                                        </div>
+                                    <?= $form->field($model, 'verifyCode')->widget(Captcha::className(), [
+                                        'template' => '
+                                                    <div class="input-blocks-wrapper">
+                                                        <div class="input-blocks">
+                                                            <label for="input-txt-8">Введите проверочный код</label>
+                                                            {input}
+                                                        </div>
+                                                    </div>
+                                                    <div class="input-blocks-wrapper captcha">
+                                                        <div class="input-blocks-captcha">
+                                                            {image}
+                                                        </div>
+                                                    </div>',
+                                    ])->label(false) ?>
                                     </div>
                                     <div class="input-blocks-wrapper button">
                                         <button type="submit" value="Submit">Зарегистрироваться</button>
@@ -3046,15 +3046,44 @@
 $(document).ready(function() {
 	var $select = $('.control-group select').selectize({
-		create: true,
-		sortField: {
-			field: 'text',
-			direction: 'asc'
-		},
-		dropdownParent: null,
-		onDropdownClose: function() {
-			$("#btnClear").css({display:'block'})
-		}
+        valueField: 'AuthorId',
+        labelField: 'AuthorName',
+        searchField: ['AuthorName'],
+        maxOptions: 10,
+        minimumInputLength: 2,
+        //create: function (input, callback) {
+        //    $.ajax({
+        //        url: '/site/city',
+        //        data: { 'AuthorName': input },
+        //        type: 'POST',
+        //        dataType: 'json',
+        //        success: function (response) {
+        //            return callback(response);
+        //        }
+        //    });
+        //},
+        render: {
+            option: function (item, escape) {
+                return '<div>' + escape(item.AuthorName) + '</div>';
+            }
+        },
+        load: function (query, callback) {
+            if (!query.length) return callback();
+            $.ajax({
+                url: '/site/city/' + query,
+                type: 'POST',
+                dataType: 'json',
+                data: {
+                    maxresults: 10
+                },
+                error: function () {
+                    callback();
+                },
+                success: function (res) {
+                    callback(res);
+                }
+            });
+        }
 	});