Commit 0dfdb6ef8c0e59204b29efeabd4cdce42f07ef45
1 parent
d8e2d677
tokar commit
Showing
2 changed files
with
169 additions
and
49 deletions
Show diff stats
frontend/views/accounts/general.php
| @@ -19,78 +19,143 @@ | @@ -19,78 +19,143 @@ | ||
| 19 | <div class="login-left-column-title"><?= $this->title ?></div> | 19 | <div class="login-left-column-title"><?= $this->title ?></div> |
| 20 | 20 | ||
| 21 | <div class="" id="form_definition"> | 21 | <div class="" id="form_definition"> |
| 22 | - <?php $form = ActiveForm::begin (); | 22 | + <?php $form = ActiveForm::begin (); ?> |
| 23 | 23 | ||
| 24 | 24 | ||
| 25 | 25 | ||
| 26 | 26 | ||
| 27 | -// echo $form->field ($user, 'isPerformer', ['template' => "{label}:\n{input}\n{hint}\n{error}"]) | ||
| 28 | -// ->label ('<span></span>Я - исполнитель') | ||
| 29 | -// ->hint ('Отображается если указать специализации услуг в личном кабинете.') | ||
| 30 | -// ->checkbox (['class'=> 'test', 'disabled'=>'disabled'], false); | ||
| 31 | -// echo $form->field ($user, 'isCustomer', ['template' => "{label}:\n{input}\n{hint}\n{error}"]) | ||
| 32 | -// ->label ('Я - заказчик') | ||
| 33 | -// ->hint ('Отображается если созданы заказы.') | ||
| 34 | -// ->checkbox ([], false); | ||
| 35 | -// echo $form->field ($user, 'type') | ||
| 36 | -// ->label ('Кто вы') | ||
| 37 | -// ->radioList ([1 => 'Частное лицо', 2 => 'Компания'],['class'=>'test']); | 27 | +<!--// $form->field ($user, 'isPerformer', ['template' => "{label}:\n{input}\n{hint}\n{error}"])--> |
| 28 | +<!--// ->label ('<span></span>Я - исполнитель')--> | ||
| 29 | +<!--// ->hint ('Отображается если указать специализации услуг в личном кабинете.')--> | ||
| 30 | +<!--// ->checkbox (['class'=> 'test', 'disabled'=>'disabled'], false);--> | ||
| 31 | +<!--// $form->field ($user, 'isCustomer', ['template' => "{label}:\n{input}\n{hint}\n{error}"])--> | ||
| 32 | +<!--// ->label ('Я - заказчик')--> | ||
| 33 | +<!--// ->hint ('Отображается если созданы заказы.')--> | ||
| 34 | +<!--// ->checkbox ([], false);--> | ||
| 35 | +<!--// $form->field ($user, 'type')--> | ||
| 36 | +<!--// ->label ('Кто вы')--> | ||
| 37 | +<!--// ->radioList ([1 => 'Частное лицо', 2 => 'Компания'],['class'=>'test']);--> | ||
| 38 | 38 | ||
| 39 | 39 | ||
| 40 | 40 | ||
| 41 | 41 | ||
| 42 | 42 | ||
| 43 | + | ||
| 44 | + <div class="general-check-wr style"> | ||
| 45 | + <div class="general-check"> | ||
| 43 | 46 | ||
| 44 | - echo $form->field ($user, 'isPerformer', ['template' => "{input}\n{label}\n{hint}\n{error}"]) | ||
| 45 | - ->label ('<span></span>Я - исполнитель') | ||
| 46 | - ->hint ('Отображается если указать специализации услуг в личном кабинете.') | ||
| 47 | - ->checkbox (['class'=> 'custom-check disabled', 'disabled'=>'disabled'], false); | ||
| 48 | - echo $form->field ($user, 'isCustomer', ['template' => "{input}\n{label}\n{hint}\n{error}"]) | ||
| 49 | - ->label ('<span></span>Я - заказчик') | ||
| 50 | - ->hint ('Отображается если созданы заказы.') | ||
| 51 | - ->checkbox (['class'=> 'custom-check', 'disabled'=>'disabled'], false); | ||
| 52 | - echo $form->field ($user, 'type') | ||
| 53 | - ->label ('Кто вы') | ||
| 54 | - ->radioList ([1 => 'Частное лицо', 2 => 'Компания']); | ||
| 55 | - echo $form->field ($company_info, 'name', ['options' => ['class' => 'form-group company_info']]) | 47 | + <div class="general-check-left"> |
| 48 | + <?= $form->field ($user, 'isPerformer', ['template' => "{input}\n{label}\n{error}"]) | ||
| 49 | + ->label ('<span></span>Я - исполнитель') | ||
| 50 | + ->checkbox (['class'=> 'custom-check disabled admin-check', 'disabled'=>'disabled'], false); | ||
| 51 | + ?> | ||
| 52 | + </div> | ||
| 53 | + <div class="general-check-right"> | ||
| 54 | + <div class="general-check-right-txt">Обязательно должны быть указаны специализации услуг, что бы вы попали в рейтинг исполнителей</div> | ||
| 55 | + </div> | ||
| 56 | + </div> | ||
| 57 | + | ||
| 58 | + <div class="general-check"> | ||
| 59 | + <div class="general-check-left"> | ||
| 60 | + <?= $form->field ($user, 'isCustomer', ['template' => "{input}\n{label}\n{error}"]) | ||
| 61 | + ->label ('<span></span>Я - заказчик') | ||
| 62 | + ->checkbox (['class'=> 'custom-check disabled admin-check', 'disabled'=>'disabled'], false); | ||
| 63 | + ?> | ||
| 64 | + </div> | ||
| 65 | + <div class="general-check-right"> | ||
| 66 | + <div class="general-check-right-txt">Обязательно должны быть созданы проекты вами, что бы вы попали в рейтинг исполнителей</div> | ||
| 67 | + </div> | ||
| 68 | + </div> | ||
| 69 | + | ||
| 70 | + </div> | ||
| 71 | + <div class="general-who style border-general"> | ||
| 72 | + <div class="general-who-title gen-admin-title">Кто вы:</div> | ||
| 73 | + <?= $form->field ($user, 'type') | ||
| 74 | + ->label ('Кто вы') | ||
| 75 | + ->radioList ([1 => 'Частное лицо', 2 => 'Компания']); | ||
| 76 | + ?> | ||
| 77 | + | ||
| 78 | +<!-- --><?//= $form->field ($user, 'type') | ||
| 79 | +// ->label (false) | ||
| 80 | +// ->radioList ( | ||
| 81 | +// [1 => 'Male', 0 => 'Female'], | ||
| 82 | +// [ | ||
| 83 | +// 'item' => function($index, $label, $name, $checked, $value) { | ||
| 84 | +// | ||
| 85 | +// $return = '<label class="modal-radio">'; | ||
| 86 | +// $return .= '<input type="radio" name="' . $name . '" value="' . $value . '" tabindex="3">'; | ||
| 87 | +// $return .= '<i></i>'; | ||
| 88 | +// $return .= '<span>' . ucwords($label) . '</span>'; | ||
| 89 | +// $return .= '</label>'; | ||
| 90 | +// | ||
| 91 | +// return $return; | ||
| 92 | +// } | ||
| 93 | +// ] | ||
| 94 | +// ); | ||
| 95 | +// ?> | ||
| 96 | + | ||
| 97 | + | ||
| 98 | + </div> | ||
| 99 | + | ||
| 100 | + <?= $form->field ($company_info, 'name', ['options' => ['class' => 'form-group company_info']]) | ||
| 56 | ->label ('Название компании') | 101 | ->label ('Название компании') |
| 57 | ->textInput (); | 102 | ->textInput (); |
| 58 | - echo $form->field ($company_info, 'staff', ['options' => ['class' => 'form-group company_info']]) | 103 | + ?> |
| 104 | + <?= $form->field ($company_info, 'staff', ['options' => ['class' => 'form-group company_info']]) | ||
| 59 | ->label ('Количество сотрудников') | 105 | ->label ('Количество сотрудников') |
| 60 | ->input ('number'); | 106 | ->input ('number'); |
| 61 | - echo '<div class="company_info">Контакты представителя</div>'; | ||
| 62 | - echo $form->field ($user, 'lastname') | ||
| 63 | - ->label ('Фамилия') | ||
| 64 | - ->textInput (); | ||
| 65 | - echo $form->field ($user, 'firstname') | ||
| 66 | - ->label ('Имя') | ||
| 67 | - ->textInput (); | ||
| 68 | - echo $form->field ($user_info, 'country') | 107 | + ?> |
| 108 | + <?= '<div class="company_info">Контакты представителя</div>'; | ||
| 109 | + ?> | ||
| 110 | + | ||
| 111 | + | ||
| 112 | + <div class="input-blocks-wrapper"> | ||
| 113 | + <div class="input-blocks"> | ||
| 114 | + <?= $form->field ($user, 'firstname') | ||
| 115 | + ->label ('Имя') | ||
| 116 | + ->textInput (); | ||
| 117 | + ?> | ||
| 118 | + </div> | ||
| 119 | + </div> | ||
| 120 | + | ||
| 121 | + <?= $form->field ($user, 'lastname') | ||
| 122 | + ->label ('Фамилия') | ||
| 123 | + ->textInput (); | ||
| 124 | + ?> | ||
| 125 | + <?= $form->field ($user_info, 'country') | ||
| 69 | ->label ('Ваша страна') | 126 | ->label ('Ваша страна') |
| 70 | ->textInput (); | 127 | ->textInput (); |
| 71 | - echo $form->field ($user_info, 'city') | 128 | + ?> |
| 129 | + <?= $form->field ($user_info, 'city') | ||
| 72 | ->label ('Ваш город') | 130 | ->label ('Ваш город') |
| 73 | ->textInput (); | 131 | ->textInput (); |
| 74 | - echo $form->field ($company_info, 'street', ['options' => ['class' => 'form-group company_info']]) | 132 | + ?> |
| 133 | + <?= $form->field ($company_info, 'street', ['options' => ['class' => 'form-group company_info']]) | ||
| 75 | ->label ('Улица') | 134 | ->label ('Улица') |
| 76 | ->textInput (); | 135 | ->textInput (); |
| 77 | - echo $form->field ($company_info, 'house', ['options' => ['class' => 'form-group company_info']]) | 136 | + ?> |
| 137 | + <?= $form->field ($company_info, 'house', ['options' => ['class' => 'form-group company_info']]) | ||
| 78 | ->label ('Дом') | 138 | ->label ('Дом') |
| 79 | ->textInput (); | 139 | ->textInput (); |
| 80 | - echo $form->field ($user, 'email') | 140 | + ?> |
| 141 | + <?= $form->field ($user, 'email') | ||
| 81 | ->label ('Email') | 142 | ->label ('Email') |
| 82 | ->textInput (['disabled' => 'disabled']); | 143 | ->textInput (['disabled' => 'disabled']); |
| 83 | - echo $form->field ($company_info, 'hide_mail', ['options' => ['class' => 'form-group company_info'], 'template' => "{input}{label}\n{hint}\n{error}"]) | 144 | + ?> |
| 145 | + <?= $form->field ($company_info, 'hide_mail', ['options' => ['class' => 'form-group company_info'], 'template' => "{input}{label}\n{hint}\n{error}"]) | ||
| 84 | ->label ('Не публиковать Email') | 146 | ->label ('Не публиковать Email') |
| 85 | - ->checkbox ([], false); | ||
| 86 | - echo $form->field ($user_info, 'busy') | 147 | + ->checkbox (['checked'=>'checked'], false); |
| 148 | + ?> | ||
| 149 | + <?= $form->field ($user_info, 'busy') | ||
| 87 | ->label ('Статус') | 150 | ->label ('Статус') |
| 88 | ->radioList ([0 => 'Свободен', 1 => 'Занят']); | 151 | ->radioList ([0 => 'Свободен', 1 => 'Занят']); |
| 89 | - echo $form->field ($user_info, 'member') | 152 | + ?> |
| 153 | + <?= $form->field ($user_info, 'member') | ||
| 90 | ->label ('Членство в МФП') | 154 | ->label ('Членство в МФП') |
| 91 | ->hint ('Выберите если хотите стать членом МФП и наш менеджер свяжется с Вами.') | 155 | ->hint ('Выберите если хотите стать членом МФП и наш менеджер свяжется с Вами.') |
| 92 | ->radioList ([0 => 'Не хочу', 1 => 'Хочу стать']); | 156 | ->radioList ([0 => 'Не хочу', 1 => 'Хочу стать']); |
| 93 | - echo ImageUploader::widget([ | 157 | + ?> |
| 158 | + <?= ImageUploader::widget([ | ||
| 94 | 'model'=> $user_info, | 159 | 'model'=> $user_info, |
| 95 | 'field'=>'image', | 160 | 'field'=>'image', |
| 96 | 'width'=>100, | 161 | 'width'=>100, |
| @@ -99,7 +164,8 @@ | @@ -99,7 +164,8 @@ | ||
| 99 | 'gallery' =>$user_info->image, | 164 | 'gallery' =>$user_info->image, |
| 100 | 'name' => 'Загрузить аватар' | 165 | 'name' => 'Загрузить аватар' |
| 101 | ]); | 166 | ]); |
| 102 | - echo ImageUploader::widget([ | 167 | + ?> |
| 168 | + <?= ImageUploader::widget([ | ||
| 103 | 'model'=> $user_info, | 169 | 'model'=> $user_info, |
| 104 | 'field'=>'poster', | 170 | 'field'=>'poster', |
| 105 | 'width'=>1200, | 171 | 'width'=>1200, |
| @@ -108,7 +174,8 @@ | @@ -108,7 +174,8 @@ | ||
| 108 | 'gallery' =>$user_info->poster, | 174 | 'gallery' =>$user_info->poster, |
| 109 | 'name' => 'Загрузить постер' | 175 | 'name' => 'Загрузить постер' |
| 110 | ]); | 176 | ]); |
| 111 | - echo Html::submitButton('Обновить', ['class' => 'btn btn-primary']); | 177 | + ?> |
| 178 | + <?= Html::submitButton('Обновить', ['class' => 'btn btn-primary']); | ||
| 112 | $form->end (); | 179 | $form->end (); |
| 113 | - ?> | 180 | + ?> |
| 114 | </div> | 181 | </div> |
frontend/web/css/style.css
| @@ -11,7 +11,10 @@ body { | @@ -11,7 +11,10 @@ body { | ||
| 11 | img { | 11 | img { |
| 12 | border: none; | 12 | border: none; |
| 13 | } | 13 | } |
| 14 | - | 14 | +label { |
| 15 | + margin-bottom: 0; | ||
| 16 | + font-weight: 400; | ||
| 17 | +} | ||
| 15 | input::-webkit-input-placeholder{color:#777}input::-moz-placeholder{color:#777}input:-moz-placeholder{color:#777}input:-ms-input-placeholder{color:#777}textarea::-webkit-input-placeholder{color:#777}textarea::-moz-placeholder{color:#777}textarea:-moz-placeholder{color:#777}textarea:-ms-input-placeholder{color:#777} | 18 | input::-webkit-input-placeholder{color:#777}input::-moz-placeholder{color:#777}input:-moz-placeholder{color:#777}input:-ms-input-placeholder{color:#777}textarea::-webkit-input-placeholder{color:#777}textarea::-moz-placeholder{color:#777}textarea:-moz-placeholder{color:#777}textarea:-ms-input-placeholder{color:#777} |
| 16 | input, textarea{color: #777} | 19 | input, textarea{color: #777} |
| 17 | [class*="section-box"] { | 20 | [class*="section-box"] { |
| @@ -4633,6 +4636,25 @@ input.custom-check + label span { | @@ -4633,6 +4636,25 @@ input.custom-check + label span { | ||
| 4633 | input.custom-check:checked + label span, input.custom-check:checked + label:hover span { | 4636 | input.custom-check:checked + label span, input.custom-check:checked + label:hover span { |
| 4634 | background: url(/images/sets-ico/check-active.png) no-repeat;transition: .2s; | 4637 | background: url(/images/sets-ico/check-active.png) no-repeat;transition: .2s; |
| 4635 | } | 4638 | } |
| 4639 | + | ||
| 4640 | +input.admin-check + label span { | ||
| 4641 | + width: 12px; | ||
| 4642 | + height: 12px; | ||
| 4643 | + background: url(/images/sets-ico/check.png) no-repeat; | ||
| 4644 | + float: left; | ||
| 4645 | + margin-left: 0; | ||
| 4646 | +} | ||
| 4647 | +input.disabled.admin-check:checked + label span, input.disabled.admin-check:checked + label:hover span { | ||
| 4648 | + background: #dcdcdc url(/images/check-disable.png) no-repeat;transition: .2s; | ||
| 4649 | +} | ||
| 4650 | +input.disabled.admin-check + label span, input.disabled.admin-check + label:hover span { | ||
| 4651 | + background: #dcdcdc;transition: .2s; | ||
| 4652 | +} | ||
| 4653 | +input.disabled.admin-check:checked + label, input.disabled.admin-check:checked + label:hover { | ||
| 4654 | + color: inherit; | ||
| 4655 | + border-bottom: none; | ||
| 4656 | + cursor: default; | ||
| 4657 | +} | ||
| 4636 | .check-radio-wr { | 4658 | .check-radio-wr { |
| 4637 | width: 50%; | 4659 | width: 50%; |
| 4638 | float: left; | 4660 | float: left; |
| @@ -5026,9 +5048,10 @@ input.custom-check:checked + label span, input.custom-check:checked + label:hove | @@ -5026,9 +5048,10 @@ input.custom-check:checked + label span, input.custom-check:checked + label:hove | ||
| 5026 | float: left; | 5048 | float: left; |
| 5027 | background: #0072bc; | 5049 | background: #0072bc; |
| 5028 | border-radius: 4px; | 5050 | border-radius: 4px; |
| 5051 | + margin-left: -10px; | ||
| 5029 | } | 5052 | } |
| 5030 | .login-left-column { | 5053 | .login-left-column { |
| 5031 | - width: 700px; | 5054 | + width: 720px; |
| 5032 | float: right; | 5055 | float: right; |
| 5033 | } | 5056 | } |
| 5034 | .admin-my-page { | 5057 | .admin-my-page { |
| @@ -5077,6 +5100,36 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last- | @@ -5077,6 +5100,36 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last- | ||
| 5077 | } | 5100 | } |
| 5078 | 5101 | ||
| 5079 | 5102 | ||
| 5080 | -.login-left-column-title {border-bottom: 1px solid #dbdbdb} | 5103 | +.login-left-column-title {border-bottom: 1px solid #dbdbdb; margin-top: 15px; padding-bottom: 23px;} |
| 5081 | .login-left-column-title, .login-left-column-title h1{font-size: 18px} | 5104 | .login-left-column-title, .login-left-column-title h1{font-size: 18px} |
| 5082 | -.form-group{margin-bottom: 0} | ||
| 5083 | \ No newline at end of file | 5105 | \ No newline at end of file |
| 5106 | +.form-group{margin-bottom: 0} | ||
| 5107 | +.border-general { | ||
| 5108 | + border-bottom: 1px solid #dbdbdb; | ||
| 5109 | +} | ||
| 5110 | +.general-check-wr {padding-top: 20px} | ||
| 5111 | +.general-check-left { | ||
| 5112 | + width: 120px; | ||
| 5113 | + position: absolute; | ||
| 5114 | + top: 50%; | ||
| 5115 | + margin-top: -10px; | ||
| 5116 | + left: 0; | ||
| 5117 | + height: 21px; | ||
| 5118 | +} | ||
| 5119 | +.general-check-right { | ||
| 5120 | + width: 595px; | ||
| 5121 | + float: right; | ||
| 5122 | +} | ||
| 5123 | +.general-check { height: 30px; position: relative } | ||
| 5124 | +.general-check-right-txt { | ||
| 5125 | + font-size: 13px; | ||
| 5126 | + color: #b7b7b7; | ||
| 5127 | + display: table-cell; | ||
| 5128 | + vertical-align: middle; | ||
| 5129 | + height: 19px; | ||
| 5130 | +} | ||
| 5131 | + | ||
| 5132 | +.gen-admin-title { | ||
| 5133 | + font-size: 18px; | ||
| 5134 | + color: inherit; | ||
| 5135 | +} | ||
| 5136 | +.general-who-title {margin-top: 49px} | ||
| 5084 | \ No newline at end of file | 5137 | \ No newline at end of file |