diff --git a/frontend/views/site/forms-modal-login.php b/frontend/views/site/forms-modal-login.php index 535936e..453c725 100644 --- a/frontend/views/site/forms-modal-login.php +++ b/frontend/views/site/forms-modal-login.php @@ -22,12 +22,18 @@ use yii\helpers\Url; 'id' => 'login-form', ], ]); ?> - field(new LoginForm(), 'username', [ 'template' => "{label}\n{input}\n{error}" ]) - ->label('Логин') - ->textInput (['class'=> 'custom-input-2']); ?> - field(new LoginForm(), 'password', [ 'template' => "{label}\n{input}\n{error}" ]) - ->label('Пароль') - ->textInput (['class'=> 'custom-input-2','type'=>'password']); ?> +
+ field(new LoginForm(), 'username', [ 'template' => "{label}\n{input}\n{error}" ]) + ->label('Логин') + ->textInput (['class'=> 'custom-input-2']); ?> +
+ +
+ field(new LoginForm(), 'password', [ 'template' => "{label}\n{input}\n{error}" ]) + ->label('Пароль') + ->textInput (['class'=> 'custom-input-2','type'=>'password']); ?> +
+
field(new LoginForm(), 'rememberMe', [ 'template' => "{input}\n{label}\n{error}" ]) ->label('Запомнить меня') diff --git a/frontend/views/site/login.php b/frontend/views/site/login.php index 4b4691b..05fa230 100755 --- a/frontend/views/site/login.php +++ b/frontend/views/site/login.php @@ -8,7 +8,7 @@ * @var yii\widgets\ActiveForm $form * @var LoginForm $model */ - $this->title = 'Login'; + $this->title = 'Авторизация'; $this->params[ 'breadcrumbs' ][] = $this->title; ?>

title); ?>

@@ -22,11 +22,11 @@ } ?> -

Do you already have an account on one of these sites? Click the logo to log in with it here:

- 'site/login' ]); ?> -
-

Please fill out the following fields to login:

+ 'site/login' ]); ?> + + + [ @@ -38,8 +38,13 @@ ->textInput(); ?> field($model, 'password') ->passwordInput(); ?> -field($model, 'rememberMe') - ->checkbox(); ?> +field($model, 'rememberMe', [ 'template' => "{input}\n{label}\n{error}" ]) + ->label('Запомнить меня') + ->checkbox([ + 'class' => 'custom-check', + 'checked' => 'checked', + ], false); ?> +
'btn btn-primary' ]); ?>
diff --git a/frontend/views/site/requestPasswordResetToken.php b/frontend/views/site/requestPasswordResetToken.php index fec386a..336673e 100755 --- a/frontend/views/site/requestPasswordResetToken.php +++ b/frontend/views/site/requestPasswordResetToken.php @@ -7,29 +7,44 @@ use yii\helpers\Html; use yii\bootstrap\ActiveForm; -$this->title = 'Заброс на сброс пароля'; +$this->title = 'Запрос на восстановление пароля'; $this->params['breadcrumbs'][] = $this->title; ?> -
-
+
+
-

title) ?>

+
title) ?>
-

Please fill out your email. A link to reset password will be sent there.

+
Для восстановления пароля введите email, который Вы использовали при регистрации. Из соображений безопасности мы высылаем не пароль, заданный при регистрации, а письмо со специальной ссылкой, пройдя по которой вы сможете задать новый пароль для доступа к панели управления.
-
-
- 'request-password-reset-form']); ?> - field($model, 'email') ?> -
- 'btn btn-primary']) ?> + + 'request-password-reset-form']); ?> +
+
+
+ field($model, 'email', [ 'template' => "{label}\n{input}\n{error}" ]) + ->label() + ->textInput (['class'=> 'custom-input-2']); + ?>
+
+
- +
+
+
+ 'btn btn-primary login-button']) ?> +
+
+ + + + +
diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css index 8fc0c6a..690e092 100755 --- a/frontend/web/css/style.css +++ b/frontend/web/css/style.css @@ -5335,7 +5335,72 @@ top: 272px; margin-top: 6px; margin-bottom: 60px; } - +.form-resume-wr .required:before, .site-request-password-reset .required:before{ + display: block; + content: "*"; + color: #D40000; + position: absolute; + top: 32px; + left: -15px; + width: 15px; +} +.site-request-password-reset .required:before{ + left: 125px; +} +.form-resume-wr .help-block { + width: 320px; + margin: 0; + text-align: center; + position: absolute; + top: 12px; + left: 265px; + border: 1px solid #c1c1c1; + box-shadow: 3px 3px 7px 0 rgba(200, 200, 200, .5), inset 0 -3px 0 0 #c1c1c1; + padding: 15px 0; + display: none; +} +.form-resume-wr .has-error .help-block { + display: block; + color: inherit; + background: #fff; +} +.form-resume-wr .help-block:before { + width: 20px; + height: 20px; + background: #fff; + border: 1px solid #c1c1c1; + transform: rotate(45deg); + position: absolute; + top: 50%; + left: -2px; + margin-top: -10px; +} +.form-resume-wr .help-block:after { + height: 20px; + background: #fff; + transform: rotate(45deg); + position: absolute; + left: 0px !important; + top: 50% !important; + margin-top: -10px !important; + background: #fff !important; + border: 1px solid #fff !important; +} +#modal_form_login .form-resume-wr {overflow: visible} +.site-request-password-title { + font-size: 28px; + text-align: center; + margin-top: 20px; + font-weight: 700; +} +.site-request-password-help { + font-size: 13px; + color: #b7b7b7; + line-height: 18px; + text-align: center; + margin-top: 10px; +} +.site-request-password-reset {} -- libgit2 0.21.4