Merge branch 'master' of http://git.task-on.com/ktask/taskoncom

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

@@ -99,3 +99,8 @@ a.ls_block_title {
   color: #fff;
   text-decoration: none;
 }
+.mfp-container
+{
+    position: fixed;
+    top: 10%;
+}
\ No newline at end of file

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

@@ -113,6 +113,7 @@ $(document).ready(function() {
           $('.spec_propotition').hide(); 
        }
    });
+
     $('body').on('click', 'a.ls_likes_y', function(){
         link = $(this);
         courseId = link.data('course');
@@ -144,6 +145,11 @@ $(document).ready(function() {
             });
         }
     });
+
+    $('#registration_form').magnificPopup({
+        type: 'inline',
+        preloader: false
+    });
 }); 
  
 // pre-submit callback 

common/modules/school/controllers/CourseController.php

@@ -57,7 +57,8 @@ class CourseController extends FrontendController
         //$formLogin = new \common\components\BaseForm('/common/modules/users/forms/LoginForm', $modelLogin);
         $formLoginPopup = new \common\components\BaseForm('/common/modules/users/forms/LoginPopupForm', $modelLogin);*/
         return $this->render('index', ['dataProvider' => $dataProvider, 
-            /*'formPopup' => $formPopup->out, 'formLoginPopup' => $formLoginPopup->out*/]);
+            /*'formPopup' => $formPopup->out, 'formLoginPopup' => $formLoginPopup->out*/
+        ]);
     }
     
     public function actionView($id)

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

@@ -4,6 +4,7 @@
 //echo FacebookPlugin::widget(['appId'=>'FACEBOOK_APP_ID']);
 use common\modules\school\assets\WidgetAssetBundle;
 use yii\web\View;
+use common\modules\users\widgets\RegistrationWidget;
 
 WidgetAssetBundle::register($this);
 
@@ -90,6 +91,11 @@ WidgetAssetBundle::register($this);
         </div>
     </div>
 </section>
+
+<div class="white-popup-block mfp-hide">
+    <?= RegistrationWidget::widget(); ?>
+</div>
+
 <?php /*if (Yii::$app->user->isGuest):?>
     <section class="sh_ft">
         <div class="container">
@@ -114,6 +120,3 @@ WidgetAssetBundle::register($this);
 <?php endif;*/?>
 
 <?php echo $this->render('@app/views/layouts/footer'); ?>
\ No newline at end of file
-
-
-