Commit 4bc945bc3ee6e31d7032c37efd45b00b76371607
1 parent
983116f0
tokar commit
Showing
2 changed files
with
89 additions
and
59 deletions
Show diff stats
frontend/views/site/login.php
| ... | ... | @@ -11,42 +11,62 @@ |
| 11 | 11 | $this->title = 'Авторизация'; |
| 12 | 12 | $this->params[ 'breadcrumbs' ][] = $this->title; |
| 13 | 13 | ?> |
| 14 | - <h1><?php echo Html::encode($this->title); ?></h1> | |
| 14 | +<div class="box-wr"> | |
| 15 | + <div class="box-all"> | |
| 16 | + <div class="form_site_logn-wr"> | |
| 17 | + <div class="form_site_logn_"> | |
| 18 | + <h1><?php echo Html::encode($this->title); ?></h1> | |
| 19 | + | |
| 20 | + <?php | |
| 21 | + if(Yii::$app->getSession() | |
| 22 | + ->hasFlash('error') | |
| 23 | + ) { | |
| 24 | + echo '<div class="alert alert-danger">' . Yii::$app->getSession() | |
| 25 | + ->getFlash('error') . '</div>'; | |
| 26 | + } | |
| 27 | + ?> | |
| 28 | + | |
| 29 | + | |
| 30 | + <?php //echo \nodge\eauth\Widget::widget([ 'action' => 'site/login' ]); ?> | |
| 31 | + | |
| 15 | 32 | |
| 16 | -<?php | |
| 17 | - if(Yii::$app->getSession() | |
| 18 | - ->hasFlash('error') | |
| 19 | - ) { | |
| 20 | - echo '<div class="alert alert-danger">' . Yii::$app->getSession() | |
| 21 | - ->getFlash('error') . '</div>'; | |
| 22 | - } | |
| 23 | -?> | |
| 24 | 33 | |
| 34 | + <?php $form = ActiveForm::begin([ | |
| 35 | + 'options' => [ | |
| 36 | + 'class' => 'form-horizontal', | |
| 37 | + 'id' => 'login-form', | |
| 38 | + ], | |
| 39 | + ]); ?> | |
| 40 | + <div class="input-blocks-wrapper"> | |
| 41 | + <?php echo $form->field($model, 'username') | |
| 42 | + ->textInput(['class'=>'custom-input-2']); ?> | |
| 43 | + </div> | |
| 25 | 44 | |
| 26 | -<?php //echo \nodge\eauth\Widget::widget([ 'action' => 'site/login' ]); ?> | |
| 45 | + <div class="input-blocks-wrapper"> | |
| 46 | + <?php echo $form->field($model, 'password') | |
| 47 | + ->passwordInput(['class'=>'custom-input-2']); ?> | |
| 48 | + </div> | |
| 27 | 49 | |
| 50 | + <div class="login-check-remember style"> | |
| 51 | + <?php echo $form->field($model, 'rememberMe', [ 'template' => "{input}\n{label}\n{error}" ]) | |
| 52 | + ->label('<span></span>Запомнить меня') | |
| 53 | + ->checkbox([ | |
| 54 | + 'class' => 'custom-check', | |
| 55 | + 'checked' => 'checked', | |
| 56 | + ], false); ?> | |
| 57 | + </div> | |
| 28 | 58 | |
| 29 | 59 | |
| 60 | + <div class="form-actions style"> | |
| 61 | + <?php echo Html::submitButton('Вход', [ 'class' => 'btn btn-primary login-button' ]); ?> | |
| 62 | + </div> | |
| 63 | + <div class="style" style="text-align: center; font-size: 13px; margin-top: 16px"> | |
| 64 | + <?= Html::a('Восстановить пароль', [ 'site/request-password-reset' ]) ?> | |
| 65 | + </div> | |
| 30 | 66 | |
| 31 | -<?php $form = ActiveForm::begin([ | |
| 32 | - 'options' => [ | |
| 33 | - 'class' => 'form-horizontal', | |
| 34 | - 'id' => 'login-form', | |
| 35 | - ], | |
| 36 | -]); ?> | |
| 37 | -<?php echo $form->field($model, 'username') | |
| 38 | - ->textInput(); ?> | |
| 39 | -<?php echo $form->field($model, 'password') | |
| 40 | - ->passwordInput(); ?> | |
| 41 | -<?php echo $form->field($model, 'rememberMe', [ 'template' => "{input}\n{label}\n{error}" ]) | |
| 42 | - ->label('<span></span>Запомнить меня') | |
| 43 | - ->checkbox([ | |
| 44 | - 'class' => 'custom-check', | |
| 45 | - 'checked' => 'checked', | |
| 46 | - ], false); ?> | |
| 67 | + <?php ActiveForm::end(); ?> | |
| 68 | + </div> | |
| 69 | + </div> | |
| 47 | 70 | |
| 48 | - <div class="form-actions"> | |
| 49 | - <?php echo Html::submitButton('Login', [ 'class' => 'btn btn-primary' ]); ?> | |
| 50 | 71 | </div> |
| 51 | -<?= Html::a('Восстановить пароль', [ 'site/request-password-reset' ]) ?> | |
| 52 | -<?php ActiveForm::end(); ?> | |
| 53 | 72 | \ No newline at end of file |
| 73 | +</div> | ... | ... |
frontend/web/css/style.css
| ... | ... | @@ -945,13 +945,13 @@ li.project-home-active span{ |
| 945 | 945 | margin-left: -120px; |
| 946 | 946 | margin-top: 22px; |
| 947 | 947 | } |
| 948 | -.form-resume-wr form label { | |
| 948 | +.form-resume-wr form label, .form_site_logn-wr label { | |
| 949 | 949 | font-size: 13px; |
| 950 | 950 | font-weight: 700; |
| 951 | 951 | width: 100%; |
| 952 | 952 | float: left; |
| 953 | 953 | } |
| 954 | -.form-resume-wr form input { | |
| 954 | +.form-resume-wr form input, .form_site_logn-wr form input { | |
| 955 | 955 | width: 240px; |
| 956 | 956 | height: 29px; |
| 957 | 957 | border: 1px solid #dcdcdc; |
| ... | ... | @@ -2724,12 +2724,14 @@ input[type=file]::-webkit-file-upload-button { |
| 2724 | 2724 | .search-worker-blocks:first-child{margin-top: 20px} |
| 2725 | 2725 | .search-worker-blocks-foto-wr { |
| 2726 | 2726 | width: 318px; |
| 2727 | - | |
| 2727 | + min-height: 320px; | |
| 2728 | 2728 | float: left; |
| 2729 | 2729 | } |
| 2730 | 2730 | .search-worker-blocks-text-wr { |
| 2731 | 2731 | width: 382px; |
| 2732 | 2732 | float: right; |
| 2733 | + min-height: 320px; | |
| 2734 | + position: relative; | |
| 2733 | 2735 | } |
| 2734 | 2736 | .search-worker-blocks-ico-wr { |
| 2735 | 2737 | width: 48px; |
| ... | ... | @@ -2752,7 +2754,7 @@ input[type=file]::-webkit-file-upload-button { |
| 2752 | 2754 | text-align: center; |
| 2753 | 2755 | } |
| 2754 | 2756 | .search-worker-blocks-title { |
| 2755 | - font-size: 18px; margin-top: -4px; | |
| 2757 | + font-size: 18px; margin-top: -1px; | |
| 2756 | 2758 | } |
| 2757 | 2759 | .rating-new { |
| 2758 | 2760 | float: left; |
| ... | ... | @@ -2877,8 +2879,13 @@ input[type=file]::-webkit-file-upload-button { |
| 2877 | 2879 | .search-worker-blocks-buttons { |
| 2878 | 2880 | margin-top: 49px; |
| 2879 | 2881 | } |
| 2880 | - | |
| 2881 | - | |
| 2882 | +.search-worker-blocks-buttons { | |
| 2883 | + margin-top: 0; | |
| 2884 | + position: absolute; | |
| 2885 | + bottom: 0; | |
| 2886 | + left: 0; | |
| 2887 | +} | |
| 2888 | +.search-worker-blocks .search-worker-blocks-jobs-portfolio {margin-bottom: 41px} | |
| 2882 | 2889 | |
| 2883 | 2890 | .gallery-box-search { |
| 2884 | 2891 | width: 100%; |
| ... | ... | @@ -5286,23 +5293,6 @@ input.disabled.admin-check:checked + label, input.disabled.admin-check:checked + |
| 5286 | 5293 | left: -12px; |
| 5287 | 5294 | width: 15px; |
| 5288 | 5295 | } |
| 5289 | - | |
| 5290 | -.help-block { | |
| 5291 | - /*width: 320px;*/ | |
| 5292 | - /*margin-left: -10px;*/ | |
| 5293 | - /*text-align: center;*/ | |
| 5294 | - /*position: relative;*/ | |
| 5295 | - /*border: 1px solid #c1c1c1;*/ | |
| 5296 | - /*margin-top: 25px;*/ | |
| 5297 | - /*box-shadow: 3px 3px 7px 0 rgba(200, 200, 200, .5), inset 0 -3px 0 0 #c1c1c1;*/ | |
| 5298 | - /*padding: 15px 0;*/ | |
| 5299 | - /*display: none;*/ | |
| 5300 | -} | |
| 5301 | -.has-error .help-block { | |
| 5302 | - /*display: block;*/ | |
| 5303 | - /*color: inherit;*/ | |
| 5304 | - /*background: #fff;*/ | |
| 5305 | -} | |
| 5306 | 5296 | .new-portf-add-comm .help-block{ |
| 5307 | 5297 | width: 230px; |
| 5308 | 5298 | margin-left: 0; |
| ... | ... | @@ -5344,7 +5334,7 @@ top: 272px; |
| 5344 | 5334 | margin-top: 6px; |
| 5345 | 5335 | margin-bottom: 60px; |
| 5346 | 5336 | } |
| 5347 | -.form-resume-wr .required:before, .site-request-password-reset .required:before{ | |
| 5337 | +.form-resume-wr .required:before, .site-request-password-reset .required:before, .form_site_logn-wr .required:before{ | |
| 5348 | 5338 | display: block; |
| 5349 | 5339 | content: "*"; |
| 5350 | 5340 | color: #D40000; |
| ... | ... | @@ -5356,7 +5346,7 @@ top: 272px; |
| 5356 | 5346 | .site-request-password-reset .required:before{ |
| 5357 | 5347 | left: 125px; |
| 5358 | 5348 | } |
| 5359 | -.form-resume-wr .help-block { | |
| 5349 | +.form-resume-wr .help-block, .form_site_logn-wr .help-block { | |
| 5360 | 5350 | width: 320px; |
| 5361 | 5351 | margin: 0; |
| 5362 | 5352 | text-align: center; |
| ... | ... | @@ -5368,12 +5358,12 @@ top: 272px; |
| 5368 | 5358 | padding: 15px 0; |
| 5369 | 5359 | display: none; |
| 5370 | 5360 | } |
| 5371 | -.form-resume-wr .has-error .help-block { | |
| 5361 | +.form-resume-wr .has-error .help-block, .form_site_logn-wr .has-error .help-block{ | |
| 5372 | 5362 | display: block; |
| 5373 | 5363 | color: inherit; |
| 5374 | 5364 | background: #fff; |
| 5375 | 5365 | } |
| 5376 | -.form-resume-wr .help-block:before { | |
| 5366 | +.form-resume-wr .help-block:before, .form_site_logn-wr .help-block:before { | |
| 5377 | 5367 | width: 20px; |
| 5378 | 5368 | height: 20px; |
| 5379 | 5369 | background: #fff; |
| ... | ... | @@ -5384,7 +5374,7 @@ top: 272px; |
| 5384 | 5374 | left: -2px; |
| 5385 | 5375 | margin-top: -10px; |
| 5386 | 5376 | } |
| 5387 | -.form-resume-wr .help-block:after { | |
| 5377 | +.form-resume-wr .help-block:after, .form_site_logn-wr .help-block:after { | |
| 5388 | 5378 | height: 20px; |
| 5389 | 5379 | background: #fff; |
| 5390 | 5380 | transform: rotate(45deg); |
| ... | ... | @@ -6659,4 +6649,24 @@ input[disabled], select[disabled] { |
| 6659 | 6649 | text-align: center; |
| 6660 | 6650 | } |
| 6661 | 6651 | .right_search_perform_foto-wr {vertical-align: middle} |
| 6662 | -.section-box-customer .search-worker-blocks {margin-top: 20px} | |
| 6663 | 6652 | \ No newline at end of file |
| 6653 | +.section-box-customer .search-worker-blocks {margin-top: 20px} | |
| 6654 | +.form_site_logn-wr { | |
| 6655 | + width: 240px; | |
| 6656 | + margin: 0 auto; | |
| 6657 | +} | |
| 6658 | +.form_site_logn_ { | |
| 6659 | + width: 100%; | |
| 6660 | + padding: 30px 0; | |
| 6661 | + float: left; | |
| 6662 | + position: relative; | |
| 6663 | +} | |
| 6664 | +.form_site_logn-wr h1 { | |
| 6665 | + font-size: 24px; | |
| 6666 | + width: 100%; | |
| 6667 | + text-align: center; | |
| 6668 | +} | |
| 6669 | + | |
| 6670 | +.form_site_logn-wr .login-check-remember { | |
| 6671 | + margin-bottom: 19px; | |
| 6672 | +} | |
| 6673 | +.form_site_logn-wr input.custom-check + label span {margin-top: 1px; margin-right: 6px} | ... | ... |