Merge branch 'master' of D:\работа\test_3 with conflicts.

Виталий
1 parent 83cba62c
Showing 3 changed files with 87 additions and 25 deletions Show diff stats
frontend/views/site/forms-modal-login.php
frontend/views/site/requestPasswordResetToken.php
frontend/web/css/style.css
@@ -2,6 +2,7 @@
 use common\models\LoginForm;
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
+use yii\helpers\Url;
@@ -41,22 +42,46 @@ use yii\widgets\ActiveForm;
     <div class="form-resume-wr question">
         <div class="form-resume-sub style">Авторизация</div>
         <?php $form = ActiveForm::begin([
+            'action' => Url::toRoute('/site/login'),
             'options' => [
                 'class' => 'form-horizontal',
                 'id'    => 'login-form',
             ],
         ]); ?>
-        <?php echo $form->field(new LoginForm(), 'username')
-            ->textInput(); ?>
-        <?php echo $form->field(new LoginForm(), 'password')
-            ->passwordInput(); ?>
-        <?php echo $form->field(new LoginForm(), 'rememberMe')
-            ->checkbox(); ?>
-        <div class="form-actions">
-            <?php echo Html::submitButton('Login', [ 'class' => 'btn btn-primary' ]); ?>
+        <?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="login-check-remember">
+            <?php echo $form->field(new LoginForm(), 'rememberMe', [ 'template' => "{input}\n{label}\n{error}" ])
+                ->label('<span></span>Запомнить меня')
+                ->checkbox([
+                    'class'    => 'custom-check',
+                    'checked' => 'checked',
+                ], false); ?>
         </div>
-        <?= Html::a('Восстановить пароль', [ 'site/request-password-reset' ]) ?>
+
+        <div class="form-actions style">
+            <?php echo Html::submitButton('Вход', [ 'class' => 'login-button' ]); ?>
+        </div>
+        <div class="style" style="margin-top: 14px; font-size: 13px; text-decoration: underline; text-align: center">
+            <?= Html::a('Забыли пароль?', [ 'site/request-password-reset' ]) ?>
+        </div>
+        <div class="style" style="margin-top: 9px; font-size: 13px; text-decoration: underline; text-align: center">
+            <?= Html::a('Регистрация', [ 'site/registration' ]) ?>
+        </div>
+
+
         <?php ActiveForm::end(); ?>
-        <div class="res_form_line"></div>
+
+        <div class="res_form_line new-res_form_line"></div>
+
+
+        <div class="style">
+
+        </div>
+
     </div>
 </div>
 \ No newline at end of file
@@ -7,25 +7,30 @@
 use yii\helpers\Html;
 use yii\bootstrap\ActiveForm;
-$this->title = 'Request password reset';
+$this->title = 'Заброс на сброс пароля';
 $this->params['breadcrumbs'][] = $this->title;
 ?>
-<div class="site-request-password-reset">
-    <h1><?= Html::encode($this->title) ?></h1>
+<div class="box-wr">
+    <div class="box-all">
+        <div class="site-request-password-reset">
+            <h1><?= Html::encode($this->title) ?></h1>
-    <p>Please fill out your email. A link to reset password will be sent there.</p>
+            <p>Please fill out your email. A link to reset password will be sent there.</p>
-    <div class="row">
-        <div class="col-lg-5">
-            <?php $form = ActiveForm::begin(['id' => 'request-password-reset-form']); ?>
+            <div class="row">
+                <div class="col-lg-5">
+                    <?php $form = ActiveForm::begin(['id' => 'request-password-reset-form']); ?>
-                <?= $form->field($model, 'email') ?>
+                    <?= $form->field($model, 'email') ?>
-                <div class="form-group">
-                    <?= Html::submitButton('Send', ['class' => 'btn btn-primary']) ?>
-                </div>
+                    <div class="form-group">
+                        <?= Html::submitButton('Send', ['class' => 'btn btn-primary']) ?>
+                    </div>
-            <?php ActiveForm::end(); ?>
+                    <?php ActiveForm::end(); ?>
+                </div>
+            </div>
         </div>
     </div>
 </div>
+
@@ -2610,7 +2610,7 @@ input[type=file]::-webkit-file-upload-button {
     padding-left: 8px;
     float: left;
 }
-.search-worker-form input[type="submit"] {
+.search-worker-form input[type="submit"], .login-button {
     float: left;
     width: 82px;
     height: 29px;
@@ -2626,7 +2626,7 @@ input[type=file]::-webkit-file-upload-button {
     padding-left: 0;
     margin-left: 6px;
 }
-.search-worker-form input[type="submit"]:hover {
+.search-worker-form input[type="submit"]:hover, .login-button:hover {
     background: #fff;
     color: #0072bc;
 }
@@ -3386,6 +3386,7 @@ ul.proektant-comments {margin-top: 15px}
 }
 #modal_form_question {height: 533px}
 #modal_form_login {height: 423px}
+#modal_form_login .form-resume-wr form label{float: none}
 #modal_form_favorite .res_form_line {bottom: 85px}
 .page-favorite {
     height: 85px;
@@ -5307,7 +5308,38 @@ input.disabled.admin-check:checked + label, input.disabled.admin-check:checked +
     margin-left: 6px !important;
     width: auto !important;
 }
-.login-check-remember label span {margin-left: 0 !important;margin-top: 2px !important;}
+.login-check-remember label span {margin-left: 0 !important;}
+.login-button {
+    width: 180px;
+    outline: none;
+    float: none;
+    margin: 0 auto;
+}
+.res_form_line.new-res_form_line {
+top: 272px;
+
+}
+@media (min-width: 768px) {
+    .form-horizontal .control-label {
+        padding-top: 0;
+        margin-bottom: 0;
+         text-align: left;
+    }
+}
+.form-horizontal .form-group {
+    margin-right: 0;
+    margin-left: -0;
+}
+#modal_form_login form {top: 67px}
+.login-check-remember {
+    margin-top: 6px;
+    margin-bottom: 60px;
+}
+
+
+
+
+