From be2b3be7fc9bbea9813e9a03d7fd3c7ff0174e49 Mon Sep 17 00:00:00 2001
From: dozer111 <alkhonko@gmail.com>
Date: Tue, 14 Aug 2018 09:31:49 +0300
Subject: [PATCH] правки по формам

---
 common/models/Feedback.php              |   3 ++-
 frontend/config/main.php                | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 frontend/controllers/SiteController.php |   1 +
 frontend/views/layouts/main.php         |   7 +++++++
 frontend/views/site/index.php           |  29 +++++++++++++++++++++++++----
 frontend/web/css/change.css             |  25 +++++++++++++++++++++++++
 frontend/widgets/LanguageWidget.php     |   7 +++++++
 7 files changed, 166 insertions(+), 12 deletions(-)

diff --git a/common/models/Feedback.php b/common/models/Feedback.php
index b1d4177..51bd85f 100644
--- a/common/models/Feedback.php
+++ b/common/models/Feedback.php
@@ -123,7 +123,8 @@
                         'name',
                     ],
                     'required',
-                    'on' => self::SCENARIO_CALLBACK,
+                    'on'            => self::SCENARIO_CALLBACK,
+
                 ],
                 [
                     [ 'email' ],
diff --git a/frontend/config/main.php b/frontend/config/main.php
index bfe55bc..5d3287d 100755
--- a/frontend/config/main.php
+++ b/frontend/config/main.php
@@ -89,17 +89,23 @@
                 'attributes' => [
                     'name',
                     'phone',
+	                'email',
                     'message',
 
+
                 ],
                 'rules'      => [
+                	[
+                		['email'],
+		                'email'
+	                ],
                     [
                         [ 'message' ],
                         'text',
                     ],
                     [
                         [
-
+							'email',
                             'name',
                             'phone',
                         ],
@@ -109,15 +115,21 @@
 
                 ],
                 'labels'     => [
-                    'message'   => 'Message',
-                    'name'    => 'Name',
-                    'phone'   => 'Phone'
+                    'message'           => 'Message',
+                    'name'              => 'Name',
+                    'phone'             => 'Phone',
+	                'email'             => 'Email'
                 ],
 
                 'inputOptions'    => [
                     'name'   => [
                       'template' => '<div class="col-sm-12">{input}</div>'
                     ],
+	                'email'   => [
+
+		                'template'          =>'<div class="col-sm-12">{input}</div>',
+
+		            ],
 	                'message' => [
 		                'type'    => 'textarea',
 		                'options' => [],
@@ -130,13 +142,13 @@
                 ],
                 'buttonTemplate'  => '<div class="button-wr">{button}</div>',
 
-                'buttonContent'   => '<i class="fa fa-envelope-o"></i>'.$send,
+                'buttonContent'   => $send,
                 'sendEmail'       => true,
 	            'email'           => 'alkhonko@gmail.com',
 	            'subject'         => 'test tt22',
                 'ajax'            => true,
                 'formId'          => 'contact-form',
-                'scenario'        => 'callback',
+                'scenario'        => 'default',
                 'successCallback' => 'function (data) {
                              document.getElementById("contact-form").reset();
                              
@@ -197,8 +209,88 @@
 
 		        ],
 		        'buttonTemplate'  => '<div class="button-wr">{button}</div>',
+		        'buttonContent'   => '<i class="fa fa-envelope-o"></i>'.$send,
+		        'sendEmail'       => true,
+		        'email'           => 'alkhonko@gmail.com',
+		        'subject'         => 'test tt22',
+		        'ajax'            => true,
+		        'formId'          => 'contact-form',
+		        'scenario'        => 'callback',
+		        'successCallback' => 'function (data) {
+                             document.getElementById("contact-form").reset();
+                               
+                              
+                                var pos = ($(window).scrollTop()) + 30;
+                                
+                               $(".forms_").animate({opacity: 0, top: "0"}, 200,function(){
+            $(this).css("display", "none");
+        });
+        setTimeout(function () {
+            $("#overlay").fadeIn(400);
+            
+            if(data.status=="success"){
+             $("#success_form").css("display", "block").animate({opacity: 1, top: pos}, 700);
+            }
+            else{
+             $("#success_form.error_form").css("display", "block").animate({opacity: 1, top: pos}, 700);
+            }
+            
+           
+       
+       
+        },400)}',
+
+	        ],
+	        'request_2' => [
+		        'class'      => 'artbox\core\forms\Module',
+		        'activeRecord' => "common\models\Feedback",
+		        'templateForm' => '<div class="row">{form}</div>',
+		        'attributes' => [
+			        'name',
+			        'phone',
+			        'message',
+
+		        ],
+		        'rules'      => [
+			        [
+				        [ 'message' ],
+				        'text',
+			        ],
+			        [
+				        [
+
+					        'name',
+					        'phone',
+				        ],
+				        'required',
+
+			        ]
+		        ],
+		        'labels'     => [
+			        'message'   => 'Message',
+			        'name'    => 'Name',
+			        'phone'   => 'Phone'
+		        ],
+
+		        'inputOptions'    => [
+			        'name'   => [
+				        'template' => '<div class="col-sm-12">{input}</div>',
+				        'labelOptions' => [ 'class' => 'callback_text_input_label' ]
+			        ],
+			        'message' => [
+				        'type'    => 'textarea',
+				        'options' => [],
+				        'template' => '<div class="input-wr">{input}</div>'
+			        ],
+			        'phone'   => [
+				        'template' => '<div class="col-sm-12">{input}</div>',
+				        'labelOptions' => [ 'class' => 'callback_text_input_label' ]
+			        ],
+
+		        ],
+		        'buttonTemplate'  => '<div class="button-wr">{button}</div>',
 
-		        'buttonContent'   => '<i class="fa fa-envelope-o"></i>'.$request1,
+		        'buttonContent'   => '<i class="fa fa-envelope-o"></i>'.$send,
 		        'sendEmail'       => true,
 		        'email'           => 'alkhonko@gmail.com',
 		        'subject'         => 'test tt22',
diff --git a/frontend/controllers/SiteController.php b/frontend/controllers/SiteController.php
index e876273..1a4c895 100755
--- a/frontend/controllers/SiteController.php
+++ b/frontend/controllers/SiteController.php
@@ -52,6 +52,7 @@
         public function actionIndex()
         {
         	$model=new Feedback();
+        	$model->setScenario(Feedback::SCENARIO_CALLBACK);
             $slides = Slide::find()->with('language')->where(['status' => true])->orderBy('sort')->all();
             $articles = Article::find()
                                ->with('language')
diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php
index 7607fe0..42b16b1 100755
--- a/frontend/views/layouts/main.php
+++ b/frontend/views/layouts/main.php
@@ -40,6 +40,13 @@ $seo=\Yii::$app->get('seo');
         
 
         <?php $this->endBody() ?>
+        <style>
+            .required label::before
+            {
+                content: "";
+            }
+
+        </style>
     </body>
   </html>
 <?php $this->endPage() ?>
\ No newline at end of file
diff --git a/frontend/views/site/index.php b/frontend/views/site/index.php
index d043aa3..36be2f3 100644
--- a/frontend/views/site/index.php
+++ b/frontend/views/site/index.php
@@ -13,7 +13,12 @@ use artbox\core\models\Language;
  */
 
 
+$send="Отправить";
+$request1='Ваша заявка';
+if(strpos($_SERVER['REQUEST_URI'],"/ua")!==false) {
+	$send = "Вiдправити";
 
+}
 
 
 $settings = Settings::getInstance();
@@ -352,7 +357,7 @@ $moduleRequest=\Yii::$app->getModule('request_1');
                                         <?=\Yii::t('app','Set your request');?>
                                     </div>
 
-                                <?php echo $moduleRequest->renderForm($this); ?>
+                                <?php echo $module->renderForm($this); ?>
                                 </div>
                             </td>
                             <td>
@@ -441,15 +446,31 @@ $moduleRequest=\Yii::$app->getModule('request_1');
 
     <div class="forms-wrapp">
         <div class="forms-title"><?=\Yii::t('app','Your request1');?></div>
-	    <?php echo $moduleRequest->renderForm($this); ?>
+	    <?php echo $module->renderForm($this); ?>
     </div>
 </div>
 <div id="callback" class="forms_" style="display: none;">
     <span id="modal_close"></span>
     <div class="forms-wrapp">
         <div class="forms-title"><?=\Yii::t('app','Set your request');?></div>
-	    <?php echo $module->renderForm($this); ?>
-    </div>
+        <?php $module2=\Yii::$app->getModule('request_2');
+        #echo $module2->renderForm($this);
+        ?>
+
+        <?php  $form=\yii\widgets\ActiveForm::begin();?>
+            <?= $form->field($model,'name',
+                [ 'template' => '{label}<div >{input}</div>{error}',
+	            'labelOptions' => [ 'class' => 'callback_text_input_label' ]]); ?>
+            <?= $form->field($model,'phone',[ 'template' => '{label}<div >{input}</div>{error}',
+	            'labelOptions' => [ 'class' => 'callback_text_input_label' ]]); ?>
+            <?= $form->field($model,'message',[ 'labelOptions' => [ 'class' => 'callback_text_input_label' ]])->textarea(); ?>
+            <div class="button-wr">
+                <?= Html::submitButton($send);?>
+            </div>
+        <?php \yii\widgets\ActiveForm::end(); ?>
+        </div>
+	    <?php #echo $moduleRequest->renderForm($this); ?>
+
 </div>
 
 <div id="success_form" style="display: none;">
diff --git a/frontend/web/css/change.css b/frontend/web/css/change.css
index bbbab36..9218676 100644
--- a/frontend/web/css/change.css
+++ b/frontend/web/css/change.css
@@ -8,3 +8,28 @@
     color:#333;
     text-decoration: none;
 }
+
+
+.callback_text_input_label,label.control-label
+{
+    margin-top: 12px;
+    float: left;
+    font-size: 14px;
+    font-weight: 500;
+}
+input ,.form-control{
+    width: 100%;
+    float: left;
+    outline: none !important;
+    height: 38px;
+    background: #f6f6f6;
+    border: 1px solid #f6f6f6;
+    padding-left: 8px;
+    margin-top: 5px;
+    resize: none;
+    box-shadow: none;
+    border-radius: 4px;
+}
+.form-wrapp{
+    padding:0 15px;
+}
diff --git a/frontend/widgets/LanguageWidget.php b/frontend/widgets/LanguageWidget.php
index 70c5398..d4bd2d4 100644
--- a/frontend/widgets/LanguageWidget.php
+++ b/frontend/widgets/LanguageWidget.php
@@ -141,6 +141,13 @@
                 }
             }
 
+			foreach ($this->links as &$link){
+				if($link['title']=='ru') {
+					$link['title']=($language::getCurrent()->url=='ru')?'рус':'рос';
+				}
+				elseif($link['title']=='ua')$link['title']='укр';
+			}
+
             # определяем, какой же из шаблонов нам нужен
 	        if(!isset($this->layoutCondition)
 		        || !in_array($this->layoutCondition,[self::LAYOUT_DEFAULT,self::LAYOUT_LI,self::LAYOUT_UL])
--
libgit2 0.21.4