Skip to content

T
taskonsite-архив-перенесен
Commit 36543025 authored by Виталий Мурашко's avatar Виталий Мурашко
Browse files
Options

Authorization and registration popups, fix logout

parent eaca39a6
Show whitespace changes
Inline Side-by-side
Showing with 79 additions and 62 deletions
backend/controllers/SiteController.php
View file @ 36543025
...@@ -34,12 +34,12 @@ class SiteController extends Controller ...@@ -34,12 +34,12 @@ class SiteController extends Controller
], ],
], ],
], ],
'verbs' => [ /*'verbs' => [
'class' => VerbFilter::className(), 'class' => VerbFilter::className(),
'actions' => [ 'actions' => [
'logout' => ['post'], 'logout' => ['post'],
], ],
], ],*/
]; ];
} }
......
common/modules/eauth/widgets/views/widget.php
View file @ 36543025
...@@ -27,13 +27,13 @@ if ($popup) { ...@@ -27,13 +27,13 @@ if ($popup) {
<ul class="eauth-list"> <ul class="eauth-list">
<?php foreach ($services as $name => $service) { <?php foreach ($services as $name => $service) {
if($service->id == 'google'){ if($service->id == 'google'){
$image = '<img src="images/button_g.jpg" height="39" width="186" alt="">'; $image = '<img src="/images/button_g.jpg" height="39" width="186" alt="">';
} }
elseif($service->id == 'vk'){ elseif($service->id == 'vk'){
$image = '<img src="images/button_vk.jpg" height="39" width="186" alt="">'; $image = '<img src="/images/button_vk.jpg" height="39" width="186" alt="">';
} }
elseif($service->id == 'facebook'){ elseif($service->id == 'facebook'){
$image = '<img src="images/button_f.jpg" height="39" width="186" alt="">'; $image = '<img src="/images/button_f.jpg" height="39" width="186" alt="">';
} }
//echo '<li class="eauth-service eauth-service-id-' . $service->id . '"><p>'; //echo '<li class="eauth-service eauth-service-id-' . $service->id . '"><p>';
echo '<li class="eauth-service-id-' . $service->id . '"><p>'; echo '<li class="eauth-service-id-' . $service->id . '"><p>';
......
common/modules/school/assets/js/school.js
View file @ 36543025
...@@ -66,7 +66,6 @@ $(document).ready(function() { ...@@ -66,7 +66,6 @@ $(document).ready(function() {
}); });
$(".submit_form_reg_popup").on('click', function () { $(".submit_form_reg_popup").on('click', function () {
alert(1);
$('#reg_form_popup').ajaxSubmit(optionsPopup); $('#reg_form_popup').ajaxSubmit(optionsPopup);
return false; return false;
}); });
......
common/modules/school/controllers/CourseController.php
View file @ 36543025
...@@ -29,21 +29,20 @@ class CourseController extends BaseController ...@@ -29,21 +29,20 @@ class CourseController extends BaseController
$search = \Yii::$app->request->queryParams; $search = \Yii::$app->request->queryParams;
$dataProvider = $searchModel->search($search); $dataProvider = $searchModel->search($search);
$modelUser = new User(); /*$modelUser = new User();
$modelLogin = new LoginForm(); $modelLogin = new LoginForm();
$formPopup = new \common\components\BaseForm('/common/modules/users/forms/RegistrationUserPopupForm', $modelUser); $formPopup = new \common\components\BaseForm('/common/modules/users/forms/RegistrationUserPopupForm', $modelUser);
//$form = new \common\components\BaseForm('/common/modules/users/forms/RegistrationUserForm', $modelUser); //$form = new \common\components\BaseForm('/common/modules/users/forms/RegistrationUserForm', $modelUser);
//$formLogin = new \common\components\BaseForm('/common/modules/users/forms/LoginForm', $modelLogin); //$formLogin = new \common\components\BaseForm('/common/modules/users/forms/LoginForm', $modelLogin);
$formLoginPopup = new \common\components\BaseForm('/common/modules/users/forms/LoginPopupForm', $modelLogin); $formLoginPopup = new \common\components\BaseForm('/common/modules/users/forms/LoginPopupForm', $modelLogin);*/
return $this->render('index', ['dataProvider' => $dataProvider, return $this->render('index', ['dataProvider' => $dataProvider,
'formPopup' => $formPopup->out, 'formLoginPopup' => $formLoginPopup->out]); /*'formPopup' => $formPopup->out, 'formLoginPopup' => $formLoginPopup->out*/]);
} }
public function actionView($id) public function actionView($id)
{ {
$model = Courses::findOne($id); $model = Courses::findOne($id);
$searchModel = new SearchLessons(); $searchModel = new SearchLessons();
$search['course_id'] = $id; $search['course_id'] = $id;
$dataProvider = $searchModel->search($search); $dataProvider = $searchModel->search($search);
......
common/modules/school/views/course/index.php
View file @ 36543025
...@@ -163,26 +163,8 @@ WidgetAssetBundle::register($this); ...@@ -163,26 +163,8 @@ WidgetAssetBundle::register($this);
<button class="save-button popup_bt_send">Заказать звонок</button> <button class="save-button popup_bt_send">Заказать звонок</button>
</form> </form>
</div> </div>
<!--<div id="reg_form" class="popup"> <?php echo \common\modules\users\widgets\LoginWidget::widget(); ?>
<?php <?php echo \common\modules\users\widgets\RegistrationWidget::widget(); ?>
/*echo $formLoginPopup;
?>
<?php echo \common\modules\eauth\widgets\SocialWidget::widget(['action' => '/site/login']); */?>
</div>-->
<!-- add 00.02.16 -->
<div id="registration_form" class="popup registration_form">
<!-- <div class="txtbtnclose">Закрыть</div> -->
<span class="popup__title2">Регистрация на курс <br>Лекции для менеджеров it-отрасли</span>
<?php
echo $formPopup;
?>
</div>
<div id="registration_form2" class="popup registration_form registration_form2">
<span class="popup__title2">Войти как пользователь</span>
<?php echo $formLoginPopup;?>
</div>
</div> </div>
......
common/modules/school/views/course/view.php
View file @ 36543025
...@@ -114,16 +114,6 @@ ...@@ -114,16 +114,6 @@
<button class="save-button popup_bt_send">Заказать звонок</button> <button class="save-button popup_bt_send">Заказать звонок</button>
</form> </form>
</div> </div>
<div id="reg_form" class="popup"> <?php echo \common\modules\users\widgets\LoginWidget::widget(); ?>
<!-- <div class="txtbtnclose">Закрыть</div> --> <?php echo \common\modules\users\widgets\RegistrationWidget::widget(); ?>
<span class="popup__title">Регистрация</span>
<form class="validreg_form">
<input type="text" class="input_st field-input required alphanumeric" placeholder="Имя Фамилия">
<input type="tel" class="input_st field-input required alphanumeric" placeholder="Телефон">
<input type="email" class="input_st field-input required email" placeholder="E-mail">
<input type="password" class="input_st field-input required alphanumeric" placeholder="Придумайте пароль">
<input type="password" class="input_st field-input required alphanumeric" placeholder="Повторите пароль">
<button class="save-button popup_bt_send">Зарегистрироваться</button>
</form>
</div>
</div> </div>
common/modules/school/views/lesson/view.php
View file @ 36543025
...@@ -237,16 +237,6 @@ WidgetAssetBundle::register($this); ...@@ -237,16 +237,6 @@ WidgetAssetBundle::register($this);
<button class="save-button popup_bt_send">Заказать звонок</button> <button class="save-button popup_bt_send">Заказать звонок</button>
</form> </form>
</div> </div>
<div id="reg_form" class="popup"> <?php echo \common\modules\users\widgets\LoginWidget::widget(); ?>
<!-- <div class="txtbtnclose">Закрыть</div> --> <?php echo \common\modules\users\widgets\RegistrationWidget::widget(); ?>
<span class="popup__title">Регистрация</span>
<form class="validreg_form">
<input type="text" class="input_st field-input required alphanumeric" placeholder="Имя Фамилия">
<input type="tel" class="input_st field-input required alphanumeric" placeholder="Телефон">
<input type="email" class="input_st field-input required email" placeholder="E-mail">
<input type="password" class="input_st field-input required alphanumeric" placeholder="Придумайте пароль">
<input type="password" class="input_st field-input required alphanumeric" placeholder="Повторите пароль">
<button class="save-button popup_bt_send">Зарегистрироваться</button>
</form>
</div>
</div> </div>
common/modules/users/forms/RegistrationUserPopupForm.php
View file @ 36543025
...@@ -34,7 +34,7 @@ $elements = [ ...@@ -34,7 +34,7 @@ $elements = [
<p>Каждую неделю мы будем высылать тебе по 1 видео-уроку, который позволит освоить данную тему. Просмотр уроков и бонусных материалов - бесплатный!</p> <p>Каждую неделю мы будем высылать тебе по 1 видео-уроку, который позволит освоить данную тему. Просмотр уроков и бонусных материалов - бесплатный!</p>
<div class="registration_form_img"> <div class="registration_form_img">
<br> <br>
<img src="images/registration_form_img.jpg" alt=""> <img src="/images/registration_form_img.jpg" alt="">
<br> <br>
<br> <br>
</div> </div>
......
common/modules/users/widgets/LoginWidget.php 0 → 100644
View file @ 36543025
<?php
namespace common\modules\users\widgets;
use yii\base\Widget;
use common\models\LoginForm;
class LoginWidget extends Widget
{
public $modelLogin;
public $formLoginPopup;
/**
* Executes the widget.
* This method is called by {@link CBaseController::endWidget}.
*/
public function run()
{
$modelLogin = new LoginForm();
$formLoginPopup = new \common\components\BaseForm('/common/modules/users/forms/LoginPopupForm', $modelLogin);
echo $this->render('LoginWidget', ['formLoginPopup' => $formLoginPopup->out]);
}
}
\ No newline at end of file
common/modules/users/widgets/RegistrationWidget.php 0 → 100644
View file @ 36543025
<?php
namespace common\modules\users\widgets;
use yii\base\Widget;
use common\modules\users\models\User;
class RegistrationWidget extends Widget
{
public $modelUser;
public $formPopup;
/**
* Executes the widget.
* This method is called by {@link CBaseController::endWidget}.
*/
public function run()
{
$modelUser = new User();
$formPopup = new \common\components\BaseForm('/common/modules/users/forms/RegistrationUserPopupForm', $modelUser);
echo $this->render('RegistrationWidget', ['formPopup' => $formPopup->out]);
}
}
\ No newline at end of file
common/modules/users/widgets/views/LoginWidget.php 0 → 100644
View file @ 36543025
<div id="registration_form2" class="popup registration_form registration_form2">
<span class="popup__title2">Войти как пользователь</span>
<?php echo $formLoginPopup;?>
</div>
\ No newline at end of file
common/modules/users/widgets/views/RegistrationWidget.php 0 → 100644
View file @ 36543025
<div id="registration_form" class="popup registration_form">
<span class="popup__title2">Регистрация</span>
<?php
echo $formPopup;
?>
</div>
\ No newline at end of file
common/modules/users/widgets/views/UserBoxWidget.php
View file @ 36543025
...@@ -3,6 +3,11 @@ use yii\helpers\Html; ...@@ -3,6 +3,11 @@ use yii\helpers\Html;
use yii\web\View; use yii\web\View;
?> ?>
<?php if (!Yii::$app->user->isGuest):?>
<div class="prof_block"> <span class="prof_name"><?php echo $user->name ?></span> <div class="prof_block"> <span class="prof_name"><?php echo $user->name ?></span>
<?php echo Html::a('Выход', ['/site/logout']) ?></div> <?php echo Html::a('Выход', ['/site/logout']) ?></div>
\ No newline at end of file <?php else:?>
<div class="prof_block">
<a href="#registration_form2" class="popup-form">Вход</a>
</div>
<?php endif;?>
\ No newline at end of file
frontend/controllers/SiteController.php
View file @ 36543025
...@@ -28,8 +28,8 @@ class SiteController extends Controller ...@@ -28,8 +28,8 @@ class SiteController extends Controller
'Index' => 'Главная страница', 'Index' => 'Главная страница',
'Contacts' => 'Контакты', 'Contacts' => 'Контакты',
'Error' => 'Error', 'Error' => 'Error',
'Login' => '', 'Login' => 'Вход',
'Logout' => '', 'Logout' => 'Выход',
]; ];
} }
...@@ -63,12 +63,12 @@ class SiteController extends Controller ...@@ -63,12 +63,12 @@ class SiteController extends Controller
], ],
], ],
], ],
'verbs' => [ /* 'verbs' => [
'class' => VerbFilter::className(), 'class' => VerbFilter::className(),
'actions' => [ 'actions' => [
'logout' => ['post'], 'logout' => ['post'],
], ],
], ],*/
'eauth' => [ 'eauth' => [
// required to disable csrf validation on OpenID requests // required to disable csrf validation on OpenID requests
'class' => \nodge\eauth\openid\ControllerBehavior::className(), 'class' => \nodge\eauth\openid\ControllerBehavior::className(),
......
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

task-on.com - ООО "Арт Проект"