tokar commit

Виталий
1 parent b97c2a62
Showing 4 changed files with 117 additions and 26 deletions Show diff stats
frontend/views/site/forms-modal-login.php
frontend/views/site/login.php
frontend/views/site/requestPasswordResetToken.php
frontend/web/css/style.css
@@ -22,12 +22,18 @@ use yii\helpers\Url;
                 'id'    => 'login-form',
             ],
         ]); ?>
-        <?php echo $form->field(new LoginForm(), 'username', [ 'template' => "{label}\n{input}\n{error}" ])
-            ->label('Логин')
-            ->textInput (['class'=> 'custom-input-2']); ?>
-        <?php echo $form->field(new LoginForm(), 'password', [ 'template' => "{label}\n{input}\n{error}" ])
-            ->label('Пароль')
-            ->textInput (['class'=> 'custom-input-2','type'=>'password']); ?>
+        <div class="input-blocks-wrapper">
+            <?php echo $form->field(new LoginForm(), 'username', [ 'template' => "{label}\n{input}\n{error}" ])
+                ->label('Логин')
+                ->textInput (['class'=> 'custom-input-2']); ?>
+        </div>
+
+        <div class="input-blocks-wrapper">
+            <?php echo $form->field(new LoginForm(), 'password', [ 'template' => "{label}\n{input}\n{error}" ])
+                ->label('Пароль')
+                ->textInput (['class'=> 'custom-input-2','type'=>'password']); ?>
+        </div>
+
         <div class="login-check-remember">
             <?php echo $form->field(new LoginForm(), 'rememberMe', [ 'template' => "{input}\n{label}\n{error}" ])
                 ->label('<span></span>Запомнить меня')
@@ -8,7 +8,7 @@
      * @var yii\widgets\ActiveForm $form
      * @var LoginForm $model
      */
-    $this->title = 'Login';
+    $this->title = 'Авторизация';
     $this->params[ 'breadcrumbs' ][] = $this->title;
 ?>
     <h1><?php echo Html::encode($this->title); ?></h1>
@@ -22,11 +22,11 @@
     }
 ?>
  
-    <p class="lead">Do you already have an account on one of these sites? Click the logo to log in with it here:</p>
-<?php echo \nodge\eauth\Widget::widget([ 'action' => 'site/login' ]); ?>
-    <hr/>
  
-    <p>Please fill out the following fields to login:</p>
+<?php //echo \nodge\eauth\Widget::widget([ 'action' => 'site/login' ]); ?>
+
+
+
  
 <?php $form = ActiveForm::begin([
     'options' => [
@@ -38,8 +38,13 @@
                 ->textInput(); ?>
 <?php echo $form->field($model, 'password')
                 ->passwordInput(); ?>
-<?php echo $form->field($model, 'rememberMe')
-                ->checkbox(); ?>
+<?php echo $form->field($model, 'rememberMe', [ 'template' => "{input}\n{label}\n{error}" ])
+    ->label('<span></span>Запомнить меня')
+    ->checkbox([
+        'class'    => 'custom-check',
+        'checked' => 'checked',
+    ], false); ?>
+
     <div class="form-actions">
         <?php echo Html::submitButton('Login', [ 'class' => 'btn btn-primary' ]); ?>
     </div>
@@ -7,29 +7,44 @@
 use yii\helpers\Html;
 use yii\bootstrap\ActiveForm;
  
-$this->title = 'Заброс на сброс пароля';
+$this->title = 'Запрос на восстановление пароля';
 $this->params['breadcrumbs'][] = $this->title;
 ?>
-<div class="box-wr">
-    <div class="box-all">
+<div class="box-wr" style="width: 600px">
+    <div class="box-all" style="width: 600px">
         <div class="site-request-password-reset">
-            <h1><?= Html::encode($this->title) ?></h1>
+            <div class="site-request-password-title style"><?= Html::encode($this->title) ?></div>
  
-            <p>Please fill out your email. A link to reset password will be sent there.</p>
+            <div class="site-request-password-help style">Для восстановления пароля введите email, который Вы использовали при регистрации. Из соображений безопасности мы высылаем не пароль, заданный при регистрации, а письмо со специальной ссылкой, пройдя по которой вы сможете задать новый пароль для доступа к панели управления.</div>
  
-            <div class="row">
-                <div class="col-lg-5">
-                    <?php $form = ActiveForm::begin(['id' => 'request-password-reset-form']); ?>
  
-                    <?= $form->field($model, 'email') ?>
  
-                    <div class="form-group">
-                        <?= Html::submitButton('Send', ['class' => 'btn btn-primary']) ?>
+
+                    <?php $form = ActiveForm::begin(['id' => 'request-password-reset-form']); ?>
+            <div class="input-blocks-wrapper">
+                <div style="width: 300px;margin: 0 auto">
+                    <div class="input-blocks">
+                        <?= $form->field($model, 'email', [ 'template' => "{label}\n{input}\n{error}" ])
+                            ->label()
+                            ->textInput (['class'=> 'custom-input-2']);
+                        ?>
                     </div>
+                </div>
+            </div>
  
-                    <?php ActiveForm::end(); ?>
+            <div class="input-blocks-wrapper" style="margin-top: 20px; margin-bottom: 50px">
+                <div style="width: 300px;margin: 0 auto">
+                    <div class="form-group">
+                        <?= Html::submitButton('Отправить', ['class' => 'btn btn-primary login-button']) ?>
+                    </div>
                 </div>
+
             </div>
+
+
+                    <?php ActiveForm::end(); ?>
+
+
         </div>
     </div>
 </div>
@@ -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 {}