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

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

@@ -98,4 +98,9 @@ a.ls_block_title {
   background: #F26363;
   color: #fff;
   text-decoration: none;
+}
+.mfp-container
+{
+    position: fixed;
+    top: 10%;
 }
\ No newline at end of file

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

@@ -112,37 +112,43 @@ $(document).ready(function() {
        else {
           $('.spec_propotition').hide(); 
        }
-    });
+   });
+
     $('body').on('click', 'a.ls_likes_y', function(){
-       link = $(this);
-       courseId = link.data('course');
-       if (!link.hasClass("ls_likes_y_choice") ) {
-           jQuery.ajax({
-              type: 'POST',
-              url: "/school/likes-course/like-course",
-              dataType: "html",
-              data: {'courseId': courseId},
-              success: function(data){  
-                 jQuery('.ls_likes').html(data);
-               }
-           });
-       }
-       
+        link = $(this);
+        courseId = link.data('course');
+        if (!link.hasClass("ls_likes_y_choice") ) {
+            jQuery.ajax({
+                type: 'POST',
+                url: "/school/likes-course/like-course",
+                dataType: "html",
+                data: {'courseId': courseId},
+                success: function(data){
+                    jQuery('.ls_likes').html(data);
+                }
+            });
+        }
+
     });
     $('body').on('click', 'a.ls_likes_n', function(){
-       link = $(this);
-       courseId = link.data('course');
-       if (!link.hasClass("ls_likes_n_choice")) {
-           jQuery.ajax({
-               type: 'POST',
-               url: "/school/likes-course/unlike-course",
-               data: {'courseId': courseId},
-               dataType: "html",
-               success: function(data){  
-                  jQuery('.ls_likes').html(data);
-               }
-           });
-       }
+        link = $(this);
+        courseId = link.data('course');
+        if (!link.hasClass("ls_likes_n_choice")) {
+            jQuery.ajax({
+                type: 'POST',
+                url: "/school/likes-course/unlike-course",
+                data: {'courseId': courseId},
+                dataType: "html",
+                success: function(data){
+                    jQuery('.ls_likes').html(data);
+                }
+            });
+        }
+    });
+
+    $('#registration_form').magnificPopup({
+        type: 'inline',
+        preloader: false
     });
 }); 
  

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">
@@ -113,7 +119,4 @@ WidgetAssetBundle::register($this);
     </section>
 <?php endif;*/?>
 
-<?php echo $this->render('@app/views/layouts/footer'); ?>
-
-
-
+<?php echo $this->render('@app/views/layouts/footer'); ?>
\ No newline at end of file