Commit d8e2d67748c5cdc74907857a7900a61c9aa099ae
1 parent
f178ccd2
tokar commit
Showing
3 changed files
with
156 additions
and
38 deletions
Show diff stats
frontend/views/accounts/general.php
| ... | ... | @@ -16,17 +16,39 @@ |
| 16 | 16 | $this->title = 'Учетные данные'; |
| 17 | 17 | $this->params['breadcrumbs'][] = $this->title; |
| 18 | 18 | ?> |
| 19 | -<h1><?= $this->title ?></h1> | |
| 19 | +<div class="login-left-column-title"><?= $this->title ?></div> | |
| 20 | + | |
| 20 | 21 | <div class="" id="form_definition"> |
| 21 | 22 | <?php $form = ActiveForm::begin (); |
| 22 | - echo $form->field ($user, 'isPerformer', ['template' => "{label}:\n{input}\n{hint}\n{error}"]) | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 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']); | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + echo $form->field ($user, 'isPerformer', ['template' => "{input}\n{label}\n{hint}\n{error}"]) | |
| 23 | 45 | ->label ('<span></span>Я - исполнитель') |
| 24 | 46 | ->hint ('Отображается если указать специализации услуг в личном кабинете.') |
| 25 | - ->checkbox ([], false); | |
| 26 | - echo $form->field ($user, 'isCustomer', ['template' => "{label}:\n{input}\n{hint}\n{error}"]) | |
| 27 | - ->label ('Я - заказчик') | |
| 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>Я - заказчик') | |
| 28 | 50 | ->hint ('Отображается если созданы заказы.') |
| 29 | - ->checkbox ([], false); | |
| 51 | + ->checkbox (['class'=> 'custom-check', 'disabled'=>'disabled'], false); | |
| 30 | 52 | echo $form->field ($user, 'type') |
| 31 | 53 | ->label ('Кто вы') |
| 32 | 54 | ->radioList ([1 => 'Частное лицо', 2 => 'Компания']); | ... | ... |
frontend/views/layouts/admin.php
| ... | ... | @@ -7,35 +7,24 @@ use yii\widgets\Menu; |
| 7 | 7 | /* @var $content string */ |
| 8 | 8 | $this->beginContent('@app/views/layouts/main.php'); |
| 9 | 9 | ?> |
| 10 | - <div class="wrap"> | |
| 11 | - <div class="container"> | |
| 12 | - <div class="right_block"> | |
| 13 | - <?= Breadcrumbs::widget([ | |
| 14 | - 'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [], | |
| 15 | - ]) ?> | |
| 16 | - <div class="section-box menu-content-wr"> | |
| 10 | + | |
| 11 | +<div class="section-box admin-page"> | |
| 17 | 12 | <div class="box-wr"> |
| 18 | 13 | <div class="box-all"> |
| 19 | - <?php | |
| 14 | + <div class="login-right-column"> | |
| 15 | + <div class="admin-my-page">Моя страница</div> | |
| 16 | + <?php | |
| 20 | 17 | echo Menu::widget([ |
| 21 | 18 | 'options' => [ |
| 22 | - 'class' => 'menu-content', | |
| 19 | + 'class' => 'menu-admin', | |
| 23 | 20 | ], |
| 24 | - 'activeCssClass' => 'active-menu-content', | |
| 21 | + 'activeCssClass' => 'active-menu-admin', | |
| 25 | 22 | 'items' => [ |
| 26 | 23 | [ |
| 27 | - 'label' => 'Общее', | |
| 24 | + 'label' => 'Учетные данные', | |
| 28 | 25 | 'url' => ['accounts/general'], |
| 29 | 26 | ], |
| 30 | 27 | [ |
| 31 | - 'label' => 'Портфолио', | |
| 32 | - 'url' => ['accounts/portfolio'], | |
| 33 | - ], | |
| 34 | - [ | |
| 35 | - 'label' => 'Настройка аккаунта', | |
| 36 | - 'url' => ['accounts/setting'], | |
| 37 | - ], | |
| 38 | - [ | |
| 39 | 28 | 'label' => 'Контакты', |
| 40 | 29 | 'url' => ['accounts/contacts'], |
| 41 | 30 | ], |
| ... | ... | @@ -44,37 +33,81 @@ $this->beginContent('@app/views/layouts/main.php'); |
| 44 | 33 | 'url' => ['accounts/service'], |
| 45 | 34 | ], |
| 46 | 35 | [ |
| 36 | + 'label' => 'Трудовой стаж', | |
| 37 | + 'url' => ['accounts/'], | |
| 38 | + ], | |
| 39 | + [ | |
| 47 | 40 | 'label' => 'Дополнительные навыки', |
| 48 | 41 | 'url' => ['accounts/add-skills'], |
| 49 | 42 | ], |
| 50 | 43 | [ |
| 51 | - 'label' => 'Трудовой стаж', | |
| 52 | - 'url' => ['accounts/employment'], | |
| 44 | + 'label' => 'Описание', | |
| 45 | + 'url' => ['accounts/'], | |
| 46 | + ], | |
| 47 | + | |
| 48 | + [ | |
| 49 | + 'label' => 'Команда', | |
| 50 | + 'url' => ['accounts/'], | |
| 51 | + ], | |
| 52 | + | |
| 53 | + [ | |
| 54 | + 'label' => 'Вакансии', | |
| 55 | + 'url' => ['accounts/'], | |
| 56 | + ], | |
| 57 | + [ | |
| 58 | + 'label' => 'Ваши проекты', | |
| 59 | + 'url' => ['accounts/'], | |
| 60 | + ], | |
| 61 | + [ | |
| 62 | + 'label' => 'Портфолио', | |
| 63 | + 'url' => ['accounts/portfolio'], | |
| 53 | 64 | ], |
| 65 | + | |
| 54 | 66 | [ |
| 55 | - 'label' => 'Проекты', | |
| 56 | - 'url' => ['accounts/projects'], | |
| 67 | + 'label' => 'Блог', | |
| 68 | + 'url' => ['accounts/'], | |
| 57 | 69 | ], |
| 58 | 70 | [ |
| 59 | 71 | 'label' => 'Галерея', |
| 60 | 72 | 'url' => ['accounts/gallery'], |
| 61 | 73 | ], |
| 62 | 74 | [ |
| 75 | + 'label' => 'Сообщения', | |
| 76 | + 'url' => ['accounts/'], | |
| 77 | + ], | |
| 78 | + [ | |
| 79 | + 'label' => 'Уведомления о проектах', | |
| 80 | + 'url' => ['accounts/'], | |
| 81 | + ], | |
| 82 | + [ | |
| 83 | + 'label' => 'Закладки', | |
| 84 | + 'url' => ['accounts/'], | |
| 85 | + ], | |
| 86 | + [ | |
| 87 | + 'label' => 'Настройка аккаунта', | |
| 88 | + 'url' => ['accounts/setting'], | |
| 89 | + ], | |
| 90 | + [ | |
| 63 | 91 | 'label' => 'Выход', |
| 92 | + 'options' => ['class'=>'logout-li'], | |
| 64 | 93 | 'url' => ['/site/logout'] |
| 65 | 94 | ], |
| 95 | +// [ | |
| 96 | +// 'label' => 'Общее', | |
| 97 | +// 'options' => ['class'=>'test'], | |
| 98 | +// 'url' => ['accounts/general'], | |
| 99 | +// ], | |
| 66 | 100 | ], |
| 67 | 101 | ]); |
| 68 | - ?> | |
| 102 | + ?> | |
| 103 | + </div> | |
| 104 | + | |
| 105 | + <div class="login-left-column"> | |
| 106 | + <?= $content ?> | |
| 107 | + </div> | |
| 108 | + | |
| 69 | 109 | </div> |
| 70 | 110 | </div> |
| 71 | 111 | </div> |
| 72 | - <div class="menu-location-index"> | |
| 73 | - <?= $content ?> | |
| 74 | - | |
| 75 | - </div> | |
| 76 | 112 | |
| 77 | - </div> | |
| 78 | - </div> | |
| 79 | - </div> | |
| 80 | 113 | <?php $this->endContent() ?> |
| 81 | 114 | \ No newline at end of file | ... | ... |
frontend/web/css/style.css
| ... | ... | @@ -4605,6 +4605,7 @@ input.custom-radio + label, input.custom-check + label { |
| 4605 | 4605 | font-size: 13px; |
| 4606 | 4606 | cursor: pointer; |
| 4607 | 4607 | margin-left: 6px; |
| 4608 | + display: inline; | |
| 4608 | 4609 | } |
| 4609 | 4610 | input.custom-radio:checked + label, input.custom-check:checked + label { |
| 4610 | 4611 | color: #0072bc; |
| ... | ... | @@ -5016,4 +5017,66 @@ input.custom-check:checked + label span, input.custom-check:checked + label:hove |
| 5016 | 5017 | transition: 0.2s; |
| 5017 | 5018 | background: #62b8ef; |
| 5018 | 5019 | color: #fff; |
| 5019 | -} | |
| 5020 | 5020 | \ No newline at end of file |
| 5021 | +} | |
| 5022 | + | |
| 5023 | +/***login***/ | |
| 5024 | +.section-box.admin-page {margin-top: 30px} | |
| 5025 | +.login-right-column { | |
| 5026 | + width: 210px; | |
| 5027 | + float: left; | |
| 5028 | + background: #0072bc; | |
| 5029 | + border-radius: 4px; | |
| 5030 | +} | |
| 5031 | +.login-left-column { | |
| 5032 | + width: 700px; | |
| 5033 | + float: right; | |
| 5034 | +} | |
| 5035 | +.admin-my-page { | |
| 5036 | + height: 46px; | |
| 5037 | + color: #fff; | |
| 5038 | + line-height: 46px; | |
| 5039 | + box-sizing: border-box; | |
| 5040 | + padding-left: 15px; | |
| 5041 | + width: 100%; | |
| 5042 | +} | |
| 5043 | +ul.menu-admin{ | |
| 5044 | + width: 100%; | |
| 5045 | + float: left; | |
| 5046 | + padding: 0 0 0 0; | |
| 5047 | + margin: 0; | |
| 5048 | +} | |
| 5049 | +ul.menu-admin li { | |
| 5050 | + width: 100%; | |
| 5051 | + float: left; | |
| 5052 | + list-style: none; | |
| 5053 | + border-top: 1px solid #62b8ef; | |
| 5054 | + box-sizing: border-box; | |
| 5055 | + padding-left: 15px; | |
| 5056 | + height: 29px; | |
| 5057 | +} | |
| 5058 | + | |
| 5059 | +ul.menu-admin li a { | |
| 5060 | + color: #fff; | |
| 5061 | + text-decoration: none; | |
| 5062 | + font-size: 13px; | |
| 5063 | + width: 100%; | |
| 5064 | + display: block; | |
| 5065 | + height: 29px; | |
| 5066 | + line-height: 29px; | |
| 5067 | + position: relative; | |
| 5068 | +} | |
| 5069 | +ul.menu-admin li:hover a{ | |
| 5070 | + color: #62b8ef; | |
| 5071 | + transition: 0.2s; | |
| 5072 | +} | |
| 5073 | +ul.menu-admin li.active-menu-admin {background: #62b8ef;} | |
| 5074 | +ul.menu-admin li.active-menu-admin a{color: #fff} | |
| 5075 | +ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last-child, ul.menu-admin li:last-child a{ | |
| 5076 | + height: 34px; | |
| 5077 | + line-height: 34px; | |
| 5078 | +} | |
| 5079 | + | |
| 5080 | + | |
| 5081 | +.login-left-column-title {border-bottom: 1px solid #dbdbdb} | |
| 5082 | +.login-left-column-title, .login-left-column-title h1{font-size: 18px} | |
| 5083 | +.form-group{margin-bottom: 0} | |
| 5021 | 5084 | \ No newline at end of file | ... | ... |