Merge remote-tracking branch 'origin/master'

common/components/LangRequest.php

@@ -3,12 +3,27 @@ namespace common\components;
 
 use Yii;
 use yii\web\Request;
+// use yii\helpers\Url;
 use common\modules\languages\models\Languages;
 
 class LangRequest extends Request
 {
     private $_lang_url;
 
+    public function init()
+    {
+        $url = explode('/', $this->getUrl());
+        $url = $url[1];
+        $lang = Languages::getLangByUrl($url);
+
+        if($lang !== null && $lang->default)
+        {
+            header('Location: ' . $this->getLangUrl()); die();
+        }
+
+        parent::init();
+    }
+
     public function getLangUrl()
     {
         if ($this->_lang_url === null) 

common/modules/bids/models/Bid.php

@@ -26,6 +26,8 @@ class Bid extends \common\components\ActiveRecordModel
     const FORM_PROJECT = 'project';
     const FORM_MESSAGE = 'message';
 
+    const TAG_INVOLVEMENT = 'Вовлечение';
+
     const FILE_FOLDER = '/uploads/bids/';
 
     public $file;
@@ -37,6 +39,11 @@ class Bid extends \common\components\ActiveRecordModel
         self::FORM_MESSAGE => 'Сообщение с сайта',
     ];
 
+    public static $tag_titles = [
+        self::TAG_INVOLVEMENT => 'Вовлечение',
+        self::FORM_SUBSCRIBE => 'Ошибки',
+    ];
+
     /**
      * @inheritdoc
      */
@@ -129,7 +136,7 @@ class Bid extends \common\components\ActiveRecordModel
                 "Content-Transfer-Encoding: 8bit\r\n".
                 "Content-Type: text/html; charset=\"UTF-8\"\r\n".
                 "X-Mailer: PHP v.".phpversion()."\r\n".
-                "From: Заявка с сайта TaskOn <robot@task-on.com>\r\n";
+                "From: Заявка с сайта TaskOn <".Settings::getValue('bids-support-email-from').">\r\n";
 
             $subject = "Заявка с сайта TaskOn";
 

common/modules/blog/views/post/_subscribe.php

@@ -11,18 +11,23 @@ use common\modules\bids\models\Bid;
 
 	<?php 
     $model = new Bid;
-    $model->scenario = Bid::SCENARIO_SUBSCRIBE;
+    $model->setScenario(Bid::SCENARIO_SUBSCRIBE);
+    $model->form = Bid::FORM_SUBSCRIBE;
 
     $form = ActiveForm::begin([
         'action' => '/',
+        'enableClientValidation' => false,
         'options' => [
             'class' => 'subsc_blog_form bids-form',
+            'data-title' => $title,
+            'data-form' => 'Подпись на обновления в блоге',
+            'data-tag' => Bid::TAG_INVOLVEMENT
         ],
     ]); ?>
     
     	<?php echo Html::hiddenInput('scenario', $model->scenario, ['class' => 'not_clear']); ?>
 
-        <?php echo Html::hiddenInput('Bid[form]', Bid::FORM_SUBSCRIBE, ['class' => 'not_clear']); ?>
+        <?php echo $form->field($model, 'form', ['template' => '{input}'])->hiddenInput(['class' => 'not_clear']); ?>
 
         <?php echo $form->field($model, 'email', [
             'template' => '<div class="row"><div class="col-sm-4">{input}</div></div>',

common/modules/blog/views/post/index.php

@@ -57,7 +57,7 @@ use yii\helpers\Url;
 
                     <?php endforeach; ?>
 
-                    <?=$this->render('_subscribe')?>
+                    <?=$this->render('_subscribe', ['title' => 'Страница Блог'])?>
 
                 </section>
             </div>
@@ -68,6 +68,6 @@ use yii\helpers\Url;
     </div>
 </div>
 
-<div class="end_keys_neft"></div>
+<!-- <div class="end_keys_neft"></div> -->
 
 <?=$this->render('@app/views/layouts/footer');?>
\ No newline at end of file

common/modules/blog/views/post/tag.php

@@ -57,7 +57,7 @@ use yii\helpers\Url;
 
                     <?php endforeach; ?>
 
-                    <?=$this->render('_subscribe')?>
+                    <?=$this->render('_subscribe', ['title' => 'Тег: ' . $model->name])?>
 
                 </section>
             </div>
@@ -68,6 +68,6 @@ use yii\helpers\Url;
     </div>
 </div>
 
-<div class="end_keys_neft"></div>
+<!-- <div class="end_keys_neft"></div> -->
 
 <?=$this->render('@app/views/layouts/footer');?>
\ No newline at end of file

common/modules/blog/views/post/view.php

@@ -50,8 +50,7 @@ use yii\helpers\Html;
                         </div>
                     </article>
                     
-                    
-                    <?=$this->render('_subscribe')?>
+                    <?=$this->render('_subscribe', ['title' => 'Запись в блоге: ' . $model->lang->title])?>
 
                 </section>
             </div>
@@ -62,6 +61,6 @@ use yii\helpers\Html;
     </div>
 </div>
 
-<div class="end_keys_neft"></div>
+<!-- <div class="end_keys_neft"></div> -->
 
 <?=$this->render('@app/views/layouts/footer');?>

common/modules/eauth/models/UserEAuth.php

@@ -109,7 +109,8 @@ class UserEAuth extends \common\components\ActiveRecordModel
             $model->name = $socialProfile['name'];
             $model->status = User::STATUS_ACTIVE;
             $model->activate_date = date('Y-m-d H:i:s');
-
+            $model->source = User::SOURCE_DEFAULT;
+            
             if ($model->save()) {
                 // Assign role
                 $assignment = new AuthAssignment();

common/modules/school/assets/WidgetAssetBundle.php

+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+namespace common\modules\school\assets;
+
+use yii\web\AssetBundle;
+
+/**
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class WidgetAssetBundle extends AssetBundle
+{
+	public $sourcePath = '@common/modules/school/assets';
+	public $css = [
+		'css/school.css',
+	];
+	public $js = [
+		'js/school.js',
+        'js/jquery.form.js',
+	];
+   
+}

common/modules/school/assets/css/school.css

+.les_list_top {
+  background: none;
+}
+.empty-text{
+    margin-bottom: 30px;
+}
+.row li{
+    list-style: none;
+}
+.teltext-block{
+    margin-top: -40px;
+    margin-bottom: 15px;
+    color: #698387;
+    font-size: 14px;
+}
+a.submit_form_reg, a.submit_form_reg_popup, a.submit_form_login, a.submit_form_login_popup{
+    text-decoration: none;
+}
+.errors-reg, .errors-reg_popup, .errors_login, .errors_login_popup{
+    color: #ff5b57;
+    margin-bottom: 10px;
+}
+.sh_kurs .alert {
+    margin-top: 10px;
+    margin-bottom: 10px;
+}
+.sh_bt_send {
+  padding-top: 20px;
+  margin: 0px;
+}
+.popup_text {
+  font-size: 13px;
+  color: #698387;
+  line-height: 24px;
+  display: block;
+  margin-bottom: 10px;
+}
+a.login_form_link, a.login_form_popup_link, a.reg_popup_link, a.reg_form_link {
+    margin-top: 20px;
+    display: block;
+}
+#login_form, #login_form_popup {
+    display:none;
+}
+.mfp-container {
+    height: auto; 
+}
+.kurs_img img {
+    height: 100%;
+}
+.soc_item .fa, .fbicon:before, .gplusicon:before {
+   margin-top: 10px; 
+}

common/modules/school/assets/js/school.js

+// prepare the form when the DOM is ready 
+$(document).ready(function() { 
+    var options = { 
+        beforeSubmit:  showRequest,  // pre-submit callback 
+        success:       showResponse,  // post-submit callback 
+ 
+        // other available options: 
+        url:       '/users/user/registration',        // override for form's 'action' attribute 
+        dataType: 'json'        // 'xml', 'script', or 'json' (expected server response type) 
+    }; 
+    
+    var optionsPopup = { 
+        beforeSubmit:  showRequest,  // pre-submit callback 
+        success:       showResponsePopup,  // post-submit callback 
+ 
+        // other available options: 
+        url:       '/users/user/registration',        // override for form's 'action' attribute 
+        dataType: 'json'        // 'xml', 'script', or 'json' (expected server response type) 
+    }; 
+ 
+    var optionsLogin = { 
+        beforeSubmit:  showRequest,  // pre-submit callback 
+        success:       showResponseLogin,  // post-submit callback 
+ 
+        // other available options: 
+        url:       '/site/login',        // override for form's 'action' attribute 
+        dataType: 'json'        // 'xml', 'script', or 'json' (expected server response type) 
+    }; 
+    
+     var optionsLoginPopup = { 
+        beforeSubmit:  showRequest,  // pre-submit callback 
+        success:       showResponseLoginPopup,  // post-submit callback 
+ 
+        // other available options: 
+        url:       '/site/login',        // override for form's 'action' attribute 
+        dataType: 'json'        // 'xml', 'script', or 'json' (expected server response type) 
+    }; 
+    
+    // bind to the form's submit event 
+    $('#login_form_popup').submit(function() { 
+        $(this).ajaxSubmit(optionsLoginPopup); 
+        return false; 
+    }); 
+    
+     // bind to the form's submit event 
+    $('#login_form').submit(function() { 
+        $('.errors_login').html('');
+        $(this).ajaxSubmit(optionsLogin); 
+        return false; 
+    }); 
+    // bind to the form's submit event 
+    $('#sh_reg_form').submit(function() { 
+        $(this).ajaxSubmit(options); 
+        return false; 
+    }); 
+    
+    // bind to the form's submit event 
+    $('#reg_form_popup').submit(function() { 
+        $(this).ajaxSubmit(optionsPopup); 
+        return false; 
+    }); 
+    
+    $(".submit_form_reg").on('click', function () {
+        $('#sh_reg_form').ajaxSubmit(options); 
+        return false; 
+    });
+    
+    $(".submit_form_reg_popup").on('click', function () {
+        $('#reg_form_popup').ajaxSubmit(optionsPopup); 
+        return false; 
+    });
+    
+    $(".submit_form_login_popup").on('click', function () {
+        $('#login_form_popup').ajaxSubmit(optionsLoginPopup); 
+        return false; 
+    });
+    
+    $(".submit_form_login").on('click', function () {
+        $('#login_form').ajaxSubmit(optionsLogin); 
+        return false; 
+    });
+    
+    $(".login_form_link").on('click', function () {
+        $('#login_form').show();
+        $('#sh_reg_form').hide();
+    });
+    
+    $(".login_form_popup_link").on('click', function () {
+        $('#login_form_popup').show();
+        $('#reg_form_popup').hide();
+    });
+    
+    $(".reg_popup_link").on('click', function () {
+        $('#reg_form_popup').show();
+        $('#login_form_popup').hide();
+    });
+    
+    $(".reg_form_link").on('click', function () {
+        $('#sh_reg_form').show();
+        $('#login_form').hide();
+    });
+}); 
+ 
+// pre-submit callback 
+function showRequest(formData, jqForm, options) { 
+    var queryString = $.param(formData); 
+ 
+    return true; 
+} 
+ 
+// post-submit callback 
+function showResponse(responseText, statusText, xhr, $form)  { 
+    $('.errors-reg').html('');
+    if (responseText.errors){
+        $.each(responseText.errors, function(key,value) {
+            $('.errors-reg').append(value+'<br>');
+            $('#sh_reg_form .field-user-'+key).addClass('has-error');
+          });
+    }
+    else{
+        $('#sh_reg_form').html('<div class="alert alert-block alert-success">Регистрация успешно завершена. Вам отправлено письмо для активации аккаунта.</div>');
+    }   
+}  
+// post-submit callback 
+function showResponsePopup(responseText, statusText, xhr, $form)  { 
+    $('.errors-reg_popup').html('');
+    if (responseText.errors){
+        $.each(responseText.errors, function(key,value) {
+            $('.errors-reg_popup').append(value+'<br>');
+            $('#reg_form_popup .field-user-'+key).addClass('has-error');
+          });
+    }
+    else{
+        $('#sh_reg_form').html('<div class="alert alert-block alert-success">Регистрация успешно завершена. Вам отправлено письмо для активации аккаунта.</div>');
+        $('#reg_form_popup').html('<div class="alert alert-block alert-success">Регистрация успешно завершена. Вам отправлено письмо для активации аккаунта.</div>');
+    }   
+}
+// post-submit callback 
+function showResponseLogin(responseText, statusText, xhr, $form)  { 
+    $('.errors_login').html('');
+    if (responseText.errors){
+        $.each(responseText.errors, function(key,value) {
+            $('.errors_login').append(value+'<br>');
+            $('#login_form .field-loginform-'+key).addClass('has-error');
+          });
+    } 
+} 
+
+// post-submit callback 
+function showResponseLoginPopup(responseText, statusText, xhr, $form)  { 
+    $('.errors_login_popup').html('');
+    if (responseText.errors){
+        $.each(responseText.errors, function(key,value) {
+            $('.errors_login_popup').append(value+'<br>');
+            $('#login_form_popup .field-loginform-'+key).addClass('has-error');
+          });
+    } 
+} 
\ No newline at end of file

common/modules/school/controllers/CourseController.php

@@ -21,6 +21,10 @@ class CourseController extends BaseController
     
     public function actionIndex()
     {
+        \Yii::$app->view->registerMetaTag([
+            'property' => 'og:title',
+            'content' => 'Школа аналитики'
+        ]);
         $searchModel  = new SearchCourses();
         $search = \Yii::$app->request->queryParams;
         $dataProvider = $searchModel->search($search);		

common/modules/school/controllers/LessonController.php

@@ -18,6 +18,10 @@ class LessonController extends BaseController
     public function actionView($id)
     {
         $model = Lessons::findOne($id);
+        \Yii::$app->view->registerMetaTag([
+            'property' => 'og:title',
+            'content' => $model->title
+        ]);
         return $this->render('view', ['model' => $model]);
     }
 }

common/modules/school/controllers/StatisticsController.php

+<?php
+
+namespace common\modules\school\controllers;
+
+use common\components\BaseController;
+use common\modules\school\models\UserStatistics;
+
+class StatisticsController extends BaseController
+{
+    public static function actionsTitles()
+    {
+        return [
+            'Shares' => 'Публикации в соцсетях',
+        ];
+    }
+    
+    
+    public function actionShares()
+    {
+        if (!\Yii::$app->user->isGuest){
+            $nameSoc = $_POST['name'];
+            $lessonId = $_POST['lesson'] ? $_POST['lesson'] : UserStatistics::NOT_LESSON;
+            $userId = \Yii::$app->user->id;
+            $shareUser = UserStatistics::findOne([$nameSoc => UserStatistics::SELECTED_SOC_NETWORK, 'user_id' => $userId, 'lesson_id' => $lessonId]);
+            if (!$shareUser){
+                $shareUser = new UserStatistics();
+                $shareUser->{$nameSoc} = UserStatistics::SELECTED_SOC_NETWORK;
+                $shareUser->user_id = $userId;
+                $shareUser->lesson_id = $lessonId;
+                $shareUser->save();
+            }  
+        }
+        
+    }
+}

common/modules/school/models/Courses.php

@@ -55,7 +55,7 @@ class Courses extends \common\components\ActiveRecordModel
     {
         return [
             [['title', 'description', 'type'], 'required'],
-            [['type', 'spec_proposition'], 'integer', 'max' => 11],
+            [['type', 'spec_proposition'], 'integer'],
             [['title'], 'string', 'max' => 150],
             [['image'], 'string', 'max' => 100],
             [['description', 'description_for_course'], 'safe'],

common/modules/school/models/Lessons.php

@@ -39,7 +39,7 @@ class Lessons extends \common\components\ActiveRecordModel
             [['title', 'video_id', 'course_id', 'number'], 'required'],
             [['title'], 'string', 'max' => 150],
             [['video_id'], 'string', 'max' => 100],
-            [['course_id', 'number'], 'integer', 'max' => 11],
+            [['course_id', 'number'], 'integer'],
             [['text'], 'safe'],
         ];
     }

common/modules/school/models/UserStatistics.php

+<?php
+
+namespace common\modules\school\models;
+
+class UserStatistics extends \common\components\ActiveRecordModel
+{
+
+    const NOT_LESSON = 0;
+    const SELECTED_SOC_NETWORK = 1;
+    
+    public static function tableName()
+    {
+        return 'user_statistics';
+    }
+
+    public function name()
+    {
+        return 'Публикации в соцсетях';
+    }
+
+    public function attributeLabels() 
+    {
+        return [
+            'lesson_id' => 'Урок',
+            'user_id' => 'Пользователь',
+            'facebook' => 'Facebook',
+            'vkontakte' => 'Вконтакте',
+            'gplus' => 'Google+',
+            'twitter' => 'Twitter',
+            'tumblr' => 'Tumblr',
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['user_id'], 'required'],
+            [['lesson_id', 'user_id', 'facebook', 'vkontakte', 'gplus', 'twitter', 'tumblr'], 'integer'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function behaviors()
+    {
+        return [
+            
+        ];
+    }
+}

common/modules/school/views/course/index.php

+<?php
 
+//use kartik\social\FacebookPlugin;
+//echo FacebookPlugin::widget(['appId'=>'FACEBOOK_APP_ID']);
+use common\modules\school\assets\WidgetAssetBundle;
+use yii\web\View;
+
+WidgetAssetBundle::register($this);
+
+?>
 <section class="sh_kurs">
     <div class="container">
         <div class="row">
@@ -6,15 +15,38 @@
                 <h1>Школа аналитики</h1>
             </div>
             <div class="col-md-3 col-md-offset-3 col-xs-6 col-sm-12">
-                <ul class="sh_social">
+                <!--<ul class="sh_social">
                     <li>
                         <a href="#"><img src="/images/icon/sh_social_vk.png" height="30" width="30" alt=""></a>
                         <a href="#"><img src="/images/icon/sh_social_fb.png" height="30" width="30" alt=""></a>
                         <a href="#"><img src="/images/icon/sh_social_tw.png" height="30" width="30" alt=""></a>
                         <a href="#"><img src="/images/icon/sh_social_gp.png" height="30" width="30" alt=""></a>
                         <a href="#"><img src="/images/icon/sh_social_t.png" height="30" width="30" alt=""></a>
-                    </li>
-                </ul>
+                    </li>      
+                </ul>-->
+                <div class="sh_social">
+                    <script type="text/javascript" src="//yastatic.net/es5-shims/0.0.2/es5-shims.min.js" charset="utf-8"></script>
+                    <script type="text/javascript" src="//yastatic.net/share2/share.js" charset="utf-8"></script>
+                    <div id="my-share"></div>
+                    <?php $this->registerJs("Ya.share2('#my-share', {
+                            hooks: {
+                                onshare: function (name) {
+                                    $.ajax({
+                                           type: 'POST',
+                                           url: '/school/statistics/shares',
+                                           data: {'name': name},
+                                           success: function(data){}
+                                        });  
+                                }
+                            },
+                            theme: {
+                                services: 'vkontakte,facebook,gplus,twitter,tumblr'
+                            },
+                            content: {
+                                title: 'Школа аналитики',
+                            }
+                        });", View::POS_END, 'my-options');?>
+                </div> 
             </div>
         </div>
          <?php
@@ -89,7 +121,7 @@
             </div>
             <div class="col-md-4 col-xs-4 col-sm-12"><a href="#zvonok_form" class="zvonok_bt popup-form"><span>Заказать звонок</span></a></div>
             <div class="col-md-4 col-xs-4 col-sm-12">
-                <div class="phone_hover_foot">Стоимость звонка 0 руб,<br> в том числе с мобильного</div>
+                <!--<div class="phone_hover_foot">Стоимость звонка 0 руб,<br> в том числе с мобильного</div>-->
                 <span class="foot_phone">8-495-749-29-69</span>
             </div>
         </div>

common/modules/school/views/course/item-view-lesson.php

 <?php
-
     use yii\helpers\Url;
+    use common\modules\school\assets\WidgetAssetBundle;
     
+    WidgetAssetBundle::register($this);
 ?>
 
 <div class="col-md-3 col-xs-6 col-sm-12">

common/modules/school/views/course/item-view.php

 <?php
     use yii\helpers\Url;
-    
     use common\modules\school\models\Courses;
+    use common\modules\school\assets\WidgetAssetBundle;
+    
+    WidgetAssetBundle::register($this);
 ?>
 
 <div class="kurs_item">

common/modules/school/views/course/view.php

 <?php
     use yii\helpers\Url;
     use common\modules\users\widgets;
+    use common\modules\school\assets\WidgetAssetBundle;
+    
+    WidgetAssetBundle::register($this);
 ?>
 <section class="ks_header">
     <div class="container">
@@ -18,7 +21,7 @@
         </div>
     </div>
 </section>
-<section class="les_list_top"  style="background: url(<?php echo $model->getUrl($model->image);?>) no-repeat center center">
+<section class="les_list_top"  style="background: url(<?php echo $model->getUrl($model->image);?>) no-repeat center center; background-size: 100% auto;">
     <div class="ls_top_over">
         <div class="container">
             <div class="row">

common/modules/school/views/lesson/view.php

 <?php
-use common\modules\users\widgets;
+use common\modules\users\widgets\UserBoxWidget;
+use common\modules\school\assets\WidgetAssetBundle;
+use yii\web\View;
+
+WidgetAssetBundle::register($this);
 ?>
 <section class="ks_header">
     <div class="container">
@@ -24,15 +28,30 @@ use common\modules\users\widgets;
                 <h1 class="vc-title">Урок <?php echo $model->number;?>. <?php echo $model->title;?></h1>
             </div>
             <div class="col-md-3 col-md-offset-1 col-xs-4 col-sm-12">
-                <ul class="sh_social">
-                    <li>
-                        <a href="#"><img src="/images/icon/sh_social_vk.png" height="30" width="30" alt=""></a>
-                        <a href="#"><img src="/images/icon/sh_social_fb.png" height="30" width="30" alt=""></a>
-                        <a href="#"><img src="/images/icon/sh_social_tw.png" height="30" width="30" alt=""></a>
-                        <a href="#"><img src="/images/icon/sh_social_gp.png" height="30" width="30" alt=""></a>
-                        <a href="#"><img src="/images/icon/sh_social_t.png" height="30" width="30" alt=""></a>
-                    </li>
-                </ul>
+                <div class="sh_social">
+                    <script type="text/javascript" src="//yastatic.net/es5-shims/0.0.2/es5-shims.min.js" charset="utf-8"></script>
+                    <script type="text/javascript" src="//yastatic.net/share2/share.js" charset="utf-8"></script>
+                    <div id="my-share"></div>
+                    <?php $this->registerJs("Ya.share2('#my-share', {
+                            hooks: {
+                                onshare: function (name) {
+                                    lesson = ".$model->id.";
+                                    $.ajax({
+                                           type: 'POST',
+                                           url: '/school/statistics/shares',
+                                           data: {'name': name, 'lesson': lesson},
+                                           success: function(data){}
+                                        });  
+                                }
+                            },
+                            theme: {
+                                services: 'vkontakte,facebook,gplus,twitter,tumblr'
+                            },
+                            content: {
+                                title: 'Школа аналитики',
+                            }
+                        });", View::POS_END, 'my-options');?>
+                </div> 
             </div>
         </div>
         <div class="row">

console/migrations/m160215_210504_user_statistics.php

+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m160215_210504_user_statistics extends Migration
+{
+    public function safeUp()
+    {
+        $tableOptions = null;
+        if ($this->db->driverName === 'mysql') 
+        {
+            $tableOptions = 'CHARACTER SET utf8 COLLATE utf8_general_ci ENGINE=InnoDB';
+        }
+        
+        // Структура таблицы `user_statistics`
+ 
+        $this->createTable('user_statistics', [
+            'id' => Schema::TYPE_PK,
+            'lesson_id' => Schema::TYPE_INTEGER . '(11)',
+            'user_id' => Schema::TYPE_INTEGER . '(11) NOT NULL',
+            'facebook' => Schema::TYPE_INTEGER . '(11)',
+            'vkontakte' => Schema::TYPE_INTEGER . '(11)',
+            'gplus' => Schema::TYPE_INTEGER . '(11)',
+            'twitter' => Schema::TYPE_INTEGER . '(11)',
+            'tumblr' => Schema::TYPE_INTEGER . '(11)',
+        ], $tableOptions);
+        
+        $this->createIndex('FK_user_statistics_users', 'user_statistics', 'user_id');
+        $this->createIndex('FK_user_statistics_lessons', 'user_statistics', 'lesson_id');
+    }
+
+    public function safeDown()
+    {
+        $this->dropTable('user_statistics');
+    }
+}

frontend/views/layouts/block/case-more.php

@@ -17,8 +17,8 @@ $more = CoContent::find()
     ->one();
 ?>
 
-<section class="short_keys_sect">
-    <div class="container">
+<!-- <section class="short_keys_sect">
+    <div class="container"> -->
         <div class="row">
             <div class="col-md-12 col-xs-12 col-sm-12">
                 <h2 class="short_keys_title">Посмотрите еще один<br/> короткий кейс</h2>
@@ -70,5 +70,11 @@ $more = CoContent::find()
                 </div>
             </div>
         </div>
-    </div>
-</section>
+    <!-- </div>
+</section> -->
\ No newline at end of file
+<style type="text/css">
+    .field-bid-email,
+    .field-bid-email input {
+        margin-bottom: 0;
+    }
+</style>
\ No newline at end of file

frontend/views/layouts/block/case-subscribe.php

@@ -11,18 +11,23 @@ use common\modules\bids\models\Bid;
             <p>Процесс создания кейса очень трудоемкий.Поэтому мы занимаемся созданием кейсов свободное от работы время. Подпишитесь, чтобы следить за обновлениями.</p>
             <?php 
             $model = new Bid;
-            $model->scenario = Bid::SCENARIO_SUBSCRIBE;
+            $model->setScenario(Bid::SCENARIO_SUBSCRIBE);
+            $model->form = Bid::FORM_SUBSCRIBE;
 
             $form = ActiveForm::begin([
                 'action' => '/',
+                'enableClientValidation' => false,
                 'options' => [
                     'class' => 'keys_mail_form bids-form',
+                    'data-title' => 'Страница Кейсы',
+                    'data-form' => 'Подпись на обновления в кейсах',
+                    'data-tag' => Bid::TAG_INVOLVEMENT
                 ],
             ]); ?>
 
                 <?php echo Html::hiddenInput('scenario', $model->scenario, ['class' => 'not_clear']); ?>
 
-                <?php echo Html::hiddenInput('Bid[form]', Bid::FORM_SUBSCRIBE, ['class' => 'not_clear']); ?>
+                <?php echo $form->field($model, 'form', ['template' => '{input}'])->hiddenInput(['class' => 'not_clear']); ?>
 
                 <?php echo $form->field($model, 'email', [
                     'template' => '<div class="row"><div class="col-sm-4">{input}</div></div>',

frontend/views/layouts/block/cases.php

 <?php
 use \common\modules\content\models\CoContent;
 use yii\helpers\Html;
+use yii\helpers\Url;
 
 $models = CoContent::find()
             ->where([
@@ -17,7 +18,7 @@ $models = CoContent::find()
             <div class="col-md-6 col-xs-6 col-sm-12">
                 <div class="keys_block_small">
                     <img src="<?=$model->preview?>" height="338" width="455">
-                    <div class="keys_small_title" <?if($model->custom==CoContent::CUSTOM_WHITE){?>style="color:#fff;"<?}?>><?=$model->lang->title?></div>
+                    <a href="<?=Url::to(['/'.$model->url])?>" class="keys_small_title" <?if($model->custom==CoContent::CUSTOM_WHITE){?>style="color:#fff;"<?}?>><?=$model->lang->title?></a>
                     <div class="keys_small_foot">
                         <?=Html::a('<span>Подробнее</span>', ['/'.$model->url], ['class' => 'keys_small_btn_more'])?>
                         <!-- <a href="#" class="keys_small_tags"># Big data</a> -->

frontend/views/layouts/block/reviews.php

@@ -15,7 +15,7 @@ $reviews = Reviews::find()
                     <span class="rev_title"><?=Yii::t('reviews', 'References about us')?></span>
                 </div>
             </div>
-            <?php foreach ($reviews as $review) : ?>
+            <?php foreach ($reviews as $i => $review) : ?>
                 <?php if(!$review->video) : ?>
                     <div class="row">
                         <?php if($review->photo) : ?>
@@ -47,6 +47,15 @@ $reviews = Reviews::find()
                         </div>
                     </div>
                 <?php endif; ?>
+                <?php if($i<count($reviews)-1) : ?>
+                        </div>
+                    </section>
+                    <div class="reviews-delimiter"></div>
+                    <section class="rev_sec reviews-block">
+                        <div class="container">
+                <?php else : ?>
+                    <div class="reviews-deend"></div>
+                <?php endif; ?>
             <?php endforeach; ?>
         </div>
     </section>

frontend/views/layouts/foot.php

@@ -24,4 +24,5 @@
 
     <?php $this->registerJsFile('/js/common.js', ['position' => yii\web\View::POS_END ]);?>
     <?php $this->registerJsFile('/js/jquery.form.js', ['position' => yii\web\View::POS_END ]);?>	
-    <?php $this->registerJsFile('/js/bids-form.js', ['position' => yii\web\View::POS_END ]);?>
+    <?php $this->registerJsFile('/js/bids-form.js', ['position' => yii\web\View::POS_END ]);?>
\ No newline at end of file
+    <?php $this->registerJsFile('/js/custom.js', ['position' => yii\web\View::POS_END ]);?>
\ No newline at end of file

frontend/views/layouts/footer-index.php

@@ -12,7 +12,7 @@ use common\modules\bids\models\Bid;
             <div class="col-md-12 col-sm-12">
                 <div class="calk_form">
                     <span class="calk_form__title">Рассчитать проект</span>
-                    <span class="calk_form_subtitle">Готовы обсудить любой проект. Есть идея или готовое ТЗ по проекту - отправьте его нам</span>
+                    <span class="calk_form_subtitle">Готовы обсудить любой проект. Есть идея или готовое ТЗ по проекту - отправьте его нам!</span>
 
 
                     <?php 

frontend/views/layouts/head.php

@@ -2,6 +2,8 @@
 	<meta name="keywords" content="<?php echo \Yii::$app->controller->meta_keywords?>">
 	<meta name="description" content="<?php echo \Yii::$app->controller->meta_description?>">
 
+	<meta name='yandex-verification' content='6f739356d418cfe3' />
+
 	<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
 	<link rel="apple-touch-icon" href="/images/favicon/apple-touch-icon.png">
 	<link rel="apple-touch-icon" sizes="72x72" href="/images/favicon/apple-touch-icon-72x72.png">

frontend/web/css/custom.css

@@ -78,4 +78,87 @@ a.login_form_link, a.login_form_popup_link, a.reg_popup_link, a.reg_form_link{
 }
 .article_short_txt img {
     width: auto !important;
+}
+.reviews-block {
+    background: #fff;
+    padding-bottom: 0;
+}
+.reviews-delimiter {
+    background: #fff url(../images/rev_bg.png) no-repeat top center;
+    widows: 100%;
+    height: 166px;
+}
+section.reviews-block .row {
+    margin-bottom: 0;
+}
+.reviews-deend {
+    padding-bottom: 60px;
+}
+.keys_small_title:hover {
+    text-decoration: none;
+}
+a.toggle_bottom {
+    display: block;
+    font-size: 20px;
+    color: #fff;
+    width: 201px;
+    height: 47px;
+    border: 2px solid #fff;
+    text-align: center;
+    line-height: 40px;
+    border-radius: 50px;
+    -moz-border-radius: 50px;
+    -webkit-border-radius: 50px;
+    -o-border-radius: 50px;
+    -ms-border-radius: 50px;
+    display: block;
+    font-size: 20px;
+    color: #fff;
+    -moz-transition: all 0.3s linear 0.1s;
+    -o-transition: all 0.3s linear 0.1s;
+    -webkit-transition: all 0.3s linear 0.1s;
+    -ms-transition: all 0.3s linear 0.1s;
+    transition: all 0.3s linear 0.1s;
+    -webkit-animation-name: fadeIn;
+    animation-name: fadeIn;
+}
+a.toggle_bottom:hover, a.toggle_bottom:active, a.toggle_bottom:focus {
+    color: #000;
+    text-decoration: none;
+    background: #fff;
+}
+a.toggle_bottom:hover .icon-arrowDown2:after, a.toggle_bottom:active .icon-arrowDown2:after, a.toggle_bottom:focus .icon-arrowDown2:after {
+    background: url(../images/icon/arrow_down_black.png) no-repeat;
+}
+.e_cat_top a.toggle_bottom {
+    margin-top: 160px;
+}
+.gen_mail_top a.toggle_bottom {
+    margin-top: 66px;
+}
+.keys_appl_top a.toggle_bottom {
+    height: 47px;
+    position: relative;
+    top: 157px;
+    left: 0;
+    float: left;
+    margin-top: 0;
+}
+.first_neft a.toggle_bottom {
+    position: relative;
+    top: 270px;
+    left: 0;
+    float: left;
+    margin-top: 0;
+}
+.top_ops a.toggle_bottom {
+    position: relative;
+    top: 157px;
+    left: 0;
+    right: -28px;
+    float: right;
+    margin-top: 0;
+}
+.video_sec a.toggle_bottom {
+    margin-top: 153px;
 }
\ No newline at end of file

frontend/web/js/bids-form.js

@@ -36,6 +36,30 @@ $('form.bids-form').on('beforeSubmit', function(e) {
             {
                 form.find('input:not(.not_clear), textarea').val('');
                 $('.send_secce').show();
+
+                dataLayer.push({
+                    'event': 'UA_event',
+                    'Catagory': form.data('tag'),
+                    'Action': form.data('title'),
+                    'Label': 'Успешно'
+                });
+
+                form.find('.has-error').removeClass('has-error');
+            }
+            else
+            {
+                errors = [];
+                $.each(response, function(key, value) {
+                    $('.field-'+key).addClass('has-error');
+                    errors = errors.concat(value);
+                });
+
+                dataLayer.push({
+                    'event': 'UA_event',
+                    'Catagory': 'Ошибки',
+                    'Action': form.data('form'),
+                    'Label': errors
+                });
             }
         }
     }

frontend/web/js/common.js

@@ -15,7 +15,7 @@ $(document).ready(function() {
 		},
 		zoom: {
 			enabled: true,
-			duration: 300 // don't foget to change the duration also in CSS
+			duration: 500 // don't foget to change the duration also in CSS
 		}
 	});
 
@@ -181,10 +181,10 @@ $(document).ready(function() {
 	} catch(err) {
 
 	};
-	$(".toggle_bottom").click(function() {
-		$("html, body").animate({ scrollTop: $(".section2").height()+120 }, "slow");
-		return false;
-	});
+	// $(".toggle_bottom").click(function() {
+	// 	$("html, body").animate({ scrollTop: $(".section2").height()+120 }, "slow");
+	// 	return false;
+	// });
 	$(".mouse").click(function() {
 		$("html, body").animate({ scrollTop: $(".video_block__title").height()+700 }, "slow");
 		return false;
@@ -409,9 +409,6 @@ $(window).scroll(function() {
 	$(".p7").css({
 		"transform" : "translate(0%, -" + st /6 + "%"
 	});
-});
-$(window).scroll(function() {
-	var st = $(this).scrollTop();
 
 	$(".kns_box4").css({
 		"transform" : "translate(0%, -" + st /1 + "%"
@@ -425,9 +422,6 @@ $(window).scroll(function() {
 	$(".kns_box3").css({
 		"transform" : "translate(0%, -" + st /13 + "%"
 	});
-});
-$(window).scroll(function() {
-	var st = $(this).scrollTop();
 
 	$(".appl_p1").css({
 		"transform" : "translate(0%, -" + st /6 + "%"
@@ -441,6 +435,61 @@ $(window).scroll(function() {
 	$(".appl_p4").css({
 		"transform" : "translate(0%, -" + st /3 + "%"
 	});
+
+	$(".ops_p1").css({
+		"transform" : "translate(0%, -" + st /6 + "%"
+	});
+	$(".ops_p2").css({
+		"transform" : "translate(0%, -" + st /3 + "%"
+	});
+	$(".ops_p3").css({
+		"transform" : "translate(0%, -" + st /8 + "%"
+	});
+	$(".ops_p4").css({
+		"transform" : "translate(0%, -" + st /3 + "%"
+	});
+
+	$(".mail_p1").css({
+		"transform" : "translate(0%, -" + st /6 + "%"
+	});
+	$(".mail_p2").css({
+		"transform" : "translate(0%, -" + st /4 + "%"
+	});
+	$(".mail_p3").css({
+		"transform" : "translate(0%, -" + st /4 + "%"
+	});
+	$(".mail_p4").css({
+		"transform" : "translate(0%, -" + st /15 + "%"
+	});
+	$(".mail_p5").css({
+		"transform" : "translate(0%, -" + st /8 + "%"
+	});
+
+	$(".soc_p1").css({
+		"transform" : "translate(0%, -" + st /8 + "%"
+	});
+	$(".soc_p2").css({
+		"transform" : "translate(0%, -" + st /6 + "%"
+	});
+	$(".soc_p3").css({
+		"transform" : "translate(0%, -" + st /4 + "%"
+	});
+
+	$(".e_cat_p1").css({
+		"transform" : "translate(0%, -" + st /6 + "%"
+	});
+	$(".e_cat_p2").css({
+		"transform" : "translate(0%, -" + st /4 + "%"
+	});
+	$(".e_cat_p3").css({
+		"transform" : "translate(0%, -" + st /8 + "%"
+	});
+	$(".e_cat_p4").css({
+		"transform" : "translate(0%, -" + st /4 + "%"
+	});
+	$(".e_cat_p5").css({
+		"transform" : "translate(0%, -" + st /8 + "%"
+	});
 });
 jQuery(function($){
 	$(document).mouseup(function (e){

frontend/web/js/custom.js

+$(document).ready(function() {
+
+	$("a.toggle_bottom").click(function() {
+		var a = $(this);
+		$("html, body").animate({ scrollTop: $(a.attr('href')).position().top - 50 }, "slow");
+		return false;
+	});
+
+});
\ No newline at end of file