Fixes

parent 76995c53
...@@ -109,6 +109,7 @@ class UserEAuth extends \common\components\ActiveRecordModel ...@@ -109,6 +109,7 @@ class UserEAuth extends \common\components\ActiveRecordModel
$model->name = $socialProfile['name']; $model->name = $socialProfile['name'];
$model->status = User::STATUS_ACTIVE; $model->status = User::STATUS_ACTIVE;
$model->activate_date = date('Y-m-d H:i:s'); $model->activate_date = date('Y-m-d H:i:s');
$model->source = User::SOURCE_DEFAULT;
if ($model->save()) { if ($model->save()) {
// Assign role // Assign role
......
<?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',
];
}
.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%;
}
\ No newline at end of file
This diff is collapsed.
// 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
<?php
//use kartik\social\FacebookPlugin;
//echo FacebookPlugin::widget(['appId'=>'FACEBOOK_APP_ID']);
use common\modules\school\assets\WidgetAssetBundle;
WidgetAssetBundle::register($this);
?>
<section class="sh_kurs"> <section class="sh_kurs">
<div class="container"> <div class="container">
...@@ -89,7 +98,7 @@ ...@@ -89,7 +98,7 @@
</div> </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"><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="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> <span class="foot_phone">8-495-749-29-69</span>
</div> </div>
</div> </div>
......
<?php <?php
use yii\helpers\Url; use yii\helpers\Url;
use common\modules\school\assets\WidgetAssetBundle;
WidgetAssetBundle::register($this);
?> ?>
<div class="col-md-3 col-xs-6 col-sm-12"> <div class="col-md-3 col-xs-6 col-sm-12">
......
<?php <?php
use yii\helpers\Url; use yii\helpers\Url;
use common\modules\school\models\Courses; use common\modules\school\models\Courses;
use common\modules\school\assets\WidgetAssetBundle;
WidgetAssetBundle::register($this);
?> ?>
<div class="kurs_item"> <div class="kurs_item">
......
<?php <?php
use yii\helpers\Url; use yii\helpers\Url;
use common\modules\users\widgets; use common\modules\users\widgets;
use common\modules\school\assets\WidgetAssetBundle;
WidgetAssetBundle::register($this);
?> ?>
<section class="ks_header"> <section class="ks_header">
<div class="container"> <div class="container">
...@@ -18,7 +21,7 @@ ...@@ -18,7 +21,7 @@
</div> </div>
</div> </div>
</section> </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="ls_top_over">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
......
<?php <?php
use common\modules\users\widgets; use common\modules\users\widgets\UserBoxWidget;
use common\modules\school\assets\WidgetAssetBundle;
WidgetAssetBundle::register($this);
?> ?>
<section class="ks_header"> <section class="ks_header">
<div class="container"> <div class="container">
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
"himiklab/yii2-sitemap-module" : "*", "himiklab/yii2-sitemap-module" : "*",
"mirocow/yii2-minify-view" : "*", "mirocow/yii2-minify-view" : "*",
"kartik-v/yii2-widget-fileinput": "@dev", "kartik-v/yii2-widget-fileinput": "@dev",
"nodge/yii2-eauth": "~2.0" "nodge/yii2-eauth": "~2.0",
}, },
"require-dev": { "require-dev": {
"yiisoft/yii2-codeception": "*", "yiisoft/yii2-codeception": "*",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment