From 4476eb3511969dc118646c9c5759449e9fae3e84 Mon Sep 17 00:00:00 2001
From: Yarik <kingofdusk@gmail.com>
Date: Wed, 18 May 2016 15:21:47 +0300
Subject: [PATCH] test

---
 .gitignore                           |   1 +
 common/widgets/views/phone_field.php |  59 +++++++++++++++++++++++++++++++++++++----------------------
 common/widgets/views/site_field.php  |  99 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------
 frontend/views/site/index.php        |   1 +
 frontend/web/css/style.css           |   4 ++++
 5 files changed, 100 insertions(+), 64 deletions(-)

diff --git a/.gitignore b/.gitignore
index 06abf75..298507c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/frontend/models/ValidateHelper.php
 /tests
 /frontend/web/js/Validation.ts
 /frontend/web/js/typescript.ts
diff --git a/common/widgets/views/phone_field.php b/common/widgets/views/phone_field.php
index fc8c3e6..16237b2 100644
--- a/common/widgets/views/phone_field.php
+++ b/common/widgets/views/phone_field.php
@@ -1,14 +1,11 @@
 <?php
     use yii\helpers\Html;
-    use yii\validators\RegularExpressionValidator;
-    use yii\widgets\MaskedInput;
 
 ?>
 <fieldset>
 
     <div class="field_list">
 
-
         <?php $t = 0;
 
             $label = 0; // add this var
@@ -17,14 +14,29 @@
                 $row = $i;
                 ?>
                 <?= Html::beginTag('div', [
-                'class' => 'form-group',
+                'class' => 'form-group form-group-phone-' . ( isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0 ),
                 'id'    => isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0,
             ]) ?>
                 <div class="input-blocks">
                     <label for="cont-phone-<?= ++$label ?>">Телефон</label>
-                    <input id="cont-phone-<?= $label ?>" type="tel" pattern="^\+?(?:\d{0,3})?[\(\s]?\d{0,5}[\)\s]?\d{3}[-\s]?\d{2}[-\s]?\d{2}$" placeholder="+xx(xxx)xxx-xx-xx" class="form-control custom-input-2" value="<?= isset( $model[ $t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[phone][<?= $row ?>][0][phone]"/>
+                    <input id="cont-phone-<?= $label ?>" type="tel" placeholder="+xx(xxx)xxx-xx-xx" class="form-control custom-input-2" value="<?= isset( $model[ $t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[phone][<?= $row ?>][0][phone]"/>
                 </div>
+                <div class="help-block"></div>
                 <span data-id="<?= isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0 ?>" title="<?= Yii::t('app', 'add') ?>" class="glyphicon glyphicon-trash delete-field-item"></span>
+                <?php
+                $js = "
+                        var id = 'cont-phone-" . $label . "';
+                        $('#w0').yiiActiveForm('add', {
+                            container: '.form-group-phone-" . ( isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0 ) . "',
+                            error: '.help-block',
+                            id: id,
+                            input: '#'+id,
+                            name: 'Fields[phone][" . $row . "][0][phone]',
+                            validate: function(attribute, value, messages, deferred) {yii.validation.regularExpression(value, messages, {'pattern':/^\+?(?:\d{0,3})?[\(\s]?\d{0,5}[\)\s]?\d{3}[-\s]?\d{2}[-\s]?\d{2}$/,'not':false,'message':'Телефон введен неверно . ','skipOnEmpty':1});}
+                        });
+                    ";
+                $this->registerJs($js, $this::POS_LOAD);
+                ?>
                 <?= Html::endTag('div') ?>
                 <?php $i = ++$t; ?>
             <?php endfor; ?>
@@ -33,25 +45,28 @@
     <p class="btn btn-success add_field_<?= $this->context->id ?>">Добавить еще</p>
 
 </fieldset>
-<script>
-    var start_i_<?=$this->context->id?> = <?=$i?>;
-    var start_label_<?=$this->context->id?> = <?=$label?>; // add this var
-    $(document).ready(
-        function()
-        {
-            $('.add_field_<?=$this->context->id?>').click(
-                function()
-                {
-                    var block = $(this)
+<?php
+    $js = "
+            var start_i_" . $this->context->id . " = " . $i . ";
+            var start_label_" . $this->context->id . " = " . $label . ";
+            $(document).on('click', '.add_field_" . $this->context->id . "', function() {
+                var block = $(this)
                     .siblings('.field_list');
                     var block_id = $(this).parent('fieldset');
-                    var sub_block = '<div class="form-group" >' + '<div class="input-blocks">' + '<label for="cont-phone-' + ++start_label_<?=$this->context->id?> + '">Телефон</label>' + '<input id="cont-phone-' + start_label_<?=$this->context->id?> + '" type="tel" pattern="^\\+?(?:\\d{0,3})?[\\(\\s]?\\d{0,5}[\\)\\s]?\\d{3}[-\\s]?\\d{2}[-\\s]?\\d{2}$" placeholder="+xx(xxx)xxx-xx-xx" class="form-control custom-input-2" value="" name="Fields[phone][' + start_i_<?=$this->context->id?>++ + '][0][phone]" />' + '</div>' + '<span class="glyphicon glyphicon-trash delete-field-item custom-remove-ico"></span>' + '<div>';
+                    ++start_label_" . $this->context->id . ";
+                    var sub_block = '<div class=\"form-group form-group-phone-'+start_label_" . $this->context->id . "+'\" >' + '<div class=\"input-blocks\">' + '<label for=\"cont-phone-' + start_label_" . $this->context->id . " + '\">Телефон</label>' + '<input id=\"cont-phone-' + start_label_" . $this->context->id . " + '\" type=\"tel\" placeholder=\"+xx(xxx)xxx-xx-xx\" class=\"form-control custom-input-2\" value=\"\" name=\"Fields[phone][' + start_i_" . $this->context->id . "++ + '][0][phone]\" />' + '</div><div class=\"help-block\"></div><span class=\"glyphicon glyphicon-trash delete-field-item custom-remove-ico\"></span>' + '<div>';
                     block.append(sub_block);
-
-                }
-            );
-        }
-    );
-</script>
+                    $('#w0').yiiActiveForm('add', {
+                        container: '.form-group-phone-'+start_label_" . $this->context->id . ",
+                        error: '.help-block',
+                        id: 'cont-phone-'+start_label_" . $this->context->id . ",
+                        input: '#cont-phone-'+start_label_" . $this->context->id . ",
+                        name: 'Fields[phone][' + start_label_" . $this->context->id . "++ + '][0][phone]',
+                        validate: function(attribute, value, messages, deferred) {yii.validation.regularExpression(value, messages, {'pattern':/^\+?(?:\d{0,3})?[\(\s]?\d{0,5}[\)\s]?\d{3}[-\s]?\d{2}[-\s]?\d{2}$/,'not':false,'message':'Телефон введен неверно . ','skipOnEmpty':1});}
+                    });
+            });
+            ";
+    $this->registerJs($js, $this::POS_LOAD);
+?>
 
 
diff --git a/common/widgets/views/site_field.php b/common/widgets/views/site_field.php
index f58a58a..5fba0db 100644
--- a/common/widgets/views/site_field.php
+++ b/common/widgets/views/site_field.php
@@ -1,56 +1,71 @@
 <?php
-use yii\behaviors\SluggableBehavior;
-use yii\helpers\Html;
+    use yii\helpers\Html;
 
 ?>
 <fieldset>
 
-
     <div class="field_list">
 
+        <?php $t = 0;
 
-        <?php    $t = 0;
-
-        $label = 0;
-
-        for($i=1; $i <= count($model); $i++):
-            $row = $i;
+            $label = 0;
 
-            ?>
-
-        <?= Html::beginTag('div',['class'=>'form-group','id'=>isset($model[$i]['parent_key']) ? $model[$i]['parent_key'] : 0 ])?>
-            <div class="input-blocks">
-                <label for="cont-site-<?= ++$label ?>">Сайт</label>
-                <input id="cont-site-<?= $label  ?>" type="url" placeholder="http://" class="form-control custom-input-2" value="<?= isset($model[$t]['value']) ? $model[$t]['value'] : '' ?>" name="Fields[site][<?=$row?>][0][site]" />
-            </div>
-            <span data-id="<?= isset($model[$i]['parent_key']) ? $model[$i]['parent_key'] : 0 ?>" title="<?= Yii::t('app','add') ?>" class="glyphicon glyphicon-trash delete-field-item"></span>
-        <?= Html::endTag('div')?>
-        <?php $i = ++ $t; ?>
-    <?php endfor; ?>
+            for($i = 1; $i <= count($model); $i++):
+                $row = $i;
+                ?>
+                <?= Html::beginTag('div', [
+                'class' => 'form-group form-group-site-'. ( isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0 ),
+                'id'    => isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0,
+            ]) ?>
+                <div class="input-blocks">
+                    <label for="cont-site-<?= ++$label ?>">Сайт</label>
+                    <input id="cont-site-<?= $label ?>" type="text" placeholder="http://" class="form-control custom-input-2" value="<?= isset( $model[ $t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[site][<?= $row ?>][0][site]"/>
+                </div>
+                <div class="help-block"></div>
+                <span data-id="<?= isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0 ?>" title="<?= Yii::t('app', 'add') ?>" class="glyphicon glyphicon-trash delete-field-item"></span>
+                <?php
+                $js = "
+                        var id = 'cont-site-" . $label . "';
+                        $('#w0').yiiActiveForm('add', {
+                            container: '.form-group-site-" . ( isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0 ) . "',
+                            error: '.help-block',
+                            id: id,
+                            input: '#'+id,
+                            name: 'Fields[site][" . $row . "][0][site]',
+                            validate: function(attribute, value, messages, deferred) {yii.validation.url(value, messages, {\"pattern\":/^(http|https):\/\/(([A-Z0-9][A-Z0-9_-]*)(\.[A-Z0-9][A-Z0-9_-]*)+)(?::\d{1,5})?(?:$|[?\/#])/i,\"message\":\"Введенный адрес не является правильным URL.\",\"enableIDN\":false,\"skipOnEmpty\":1});}
+                        });
+                    ";
+                $this->registerJs($js, $this::POS_LOAD);
+                ?>
+                <?= Html::endTag('div') ?>
+                <?php $i = ++$t; ?>
+            <?php endfor; ?>
     </div>
-    <p class="btn btn-success add_field_<?= $this->context->id ?>"><?= Yii::t('app','add_more') ?></p>
+    <p class="btn btn-success add_field_<?= $this->context->id ?>"><?= Yii::t('app', 'add_more') ?></p>
 
 </fieldset>
-<script>
-    var start_i_<?=$this->context->id?> = <?=$i?>;
-    var start_label_<?=$this->context->id?> = <?=$label?>; // add this var
-    $( document ).ready(function(){
-        $('.add_field_<?=$this->context->id?>').click(function(){
-            var block     = $ (this)
-                .siblings('.field_list');
-            var block_id =  $(this).parent('fieldset');
-            var sub_block = '<div class="form-group" >'+
-
-                '<div class="input-blocks">'+
-                '<label for="cont-site-' + ++start_label_<?=$this->context->id?> +'">Сайт</label>'+
-                '<input id="cont-site-' + start_label_<?=$this->context->id?> +'" type="url" placeholder="http://" class="form-control custom-input-2" value="" name="Fields[site]['+ start_i_<?=$this->context->id?>++ +'][0][site]" />'+
-                '</div>'+
-                '<span title="<?= Yii::t('app','add') ?>" class="glyphicon glyphicon-trash delete-field-item"></span>'+
-                '<div>';
-            block.append(sub_block);
-
-        });
-    });
-</script>
+<?php
+    $js = "
+            var start_i_" . $this->context->id . " = " . $i . ";
+            var start_label_" . $this->context->id . " = " . $label . ";
+            $(document).on('click', '.add_field_" . $this->context->id . "', function() {
+                var block = $(this)
+                    .siblings('.field_list');
+                    var block_id = $(this).parent('fieldset');
+                    ++start_label_" . $this->context->id . ";
+                    var sub_block = '<div class=\"form-group form-group-site-'+start_label_" . $this->context->id . "+'\" >' + '<div class=\"input-blocks\">' + '<label for=\"cont-site-' + start_label_" . $this->context->id . " + '\">Сайт</label>' + '<input id=\"cont-site-' + start_label_" . $this->context->id . " + '\" type=\"text\" placeholder=\"http://\" class=\"form-control custom-input-2\" value=\"\" name=\"Fields[site][' + start_i_" . $this->context->id . "++ + '][0][site]\" />' + '</div><div class=\"help-block\"></div><span class=\"glyphicon glyphicon-trash delete-field-item custom-remove-ico\"></span>' + '<div>';
+                    block.append(sub_block);
+                    $('#w0').yiiActiveForm('add', {
+                        container: '.form-group-site-'+start_label_" . $this->context->id . ",
+                        error: '.help-block',
+                        id: 'cont-site-'+start_label_" . $this->context->id . ",
+                        input: '#cont-site-'+start_label_" . $this->context->id . ",
+                        name: 'Fields[site][' + start_label_" . $this->context->id . "++ + '][0][site]',
+                        validate: function(attribute, value, messages, deferred) {yii.validation.url(value, messages, {\"pattern\":/^(http|https):\/\/(([A-Z0-9][A-Z0-9_-]*)(\.[A-Z0-9][A-Z0-9_-]*)+)(?::\d{1,5})?(?:$|[?\/#])/i,\"message\":\"Введенный адрес не является правильным URL.\",\"enableIDN\":false,\"skipOnEmpty\":1});}
+                    });
+            });
+            ";
+    $this->registerJs($js, $this::POS_LOAD);
+?>
 
 
diff --git a/frontend/views/site/index.php b/frontend/views/site/index.php
index da20d51..441fddc 100755
--- a/frontend/views/site/index.php
+++ b/frontend/views/site/index.php
@@ -1,4 +1,5 @@
 <?php
+    use frontend\models\ValidateHelper;
     use \yii\helpers\Html;
     use \common\models\Specialization;
 
diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css
index 0e2b957..50818c6 100755
--- a/frontend/web/css/style.css
+++ b/frontend/web/css/style.css
@@ -7838,6 +7838,10 @@ input.disabled.admin-check:checked + label, input.disabled.admin-check:checked +
     background: #fff
 }
 
+.field_list .help-block {
+    float: left;
+}
+
 .help-block:before {
     content: '';
     width: 20px;
--
libgit2 0.21.4