From d8e2d67748c5cdc74907857a7900a61c9aa099ae Mon Sep 17 00:00:00 2001 From: icemate Date: Fri, 5 Feb 2016 13:48:55 +0200 Subject: [PATCH] tokar commit --- frontend/views/accounts/general.php | 34 ++++++++++++++++++++++++++++------ frontend/views/layouts/admin.php | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------- frontend/web/css/style.css | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 156 insertions(+), 38 deletions(-) diff --git a/frontend/views/accounts/general.php b/frontend/views/accounts/general.php index 3ddf8cc..bb98b11 100755 --- a/frontend/views/accounts/general.php +++ b/frontend/views/accounts/general.php @@ -16,17 +16,39 @@ $this->title = 'Учетные данные'; $this->params['breadcrumbs'][] = $this->title; ?> -

title ?>

+
title ?>
+
field ($user, 'isPerformer', ['template' => "{label}:\n{input}\n{hint}\n{error}"]) + + + + +// echo $form->field ($user, 'isPerformer', ['template' => "{label}:\n{input}\n{hint}\n{error}"]) +// ->label ('Я - исполнитель') +// ->hint ('Отображается если указать специализации услуг в личном кабинете.') +// ->checkbox (['class'=> 'test', 'disabled'=>'disabled'], false); +// echo $form->field ($user, 'isCustomer', ['template' => "{label}:\n{input}\n{hint}\n{error}"]) +// ->label ('Я - заказчик') +// ->hint ('Отображается если созданы заказы.') +// ->checkbox ([], false); +// echo $form->field ($user, 'type') +// ->label ('Кто вы') +// ->radioList ([1 => 'Частное лицо', 2 => 'Компания'],['class'=>'test']); + + + + + + + echo $form->field ($user, 'isPerformer', ['template' => "{input}\n{label}\n{hint}\n{error}"]) ->label ('Я - исполнитель') ->hint ('Отображается если указать специализации услуг в личном кабинете.') - ->checkbox ([], false); - echo $form->field ($user, 'isCustomer', ['template' => "{label}:\n{input}\n{hint}\n{error}"]) - ->label ('Я - заказчик') + ->checkbox (['class'=> 'custom-check disabled', 'disabled'=>'disabled'], false); + echo $form->field ($user, 'isCustomer', ['template' => "{input}\n{label}\n{hint}\n{error}"]) + ->label ('Я - заказчик') ->hint ('Отображается если созданы заказы.') - ->checkbox ([], false); + ->checkbox (['class'=> 'custom-check', 'disabled'=>'disabled'], false); echo $form->field ($user, 'type') ->label ('Кто вы') ->radioList ([1 => 'Частное лицо', 2 => 'Компания']); diff --git a/frontend/views/layouts/admin.php b/frontend/views/layouts/admin.php index cd1cfd5..9084eb2 100755 --- a/frontend/views/layouts/admin.php +++ b/frontend/views/layouts/admin.php @@ -7,35 +7,24 @@ use yii\widgets\Menu; /* @var $content string */ $this->beginContent('@app/views/layouts/main.php'); ?> -
-
-
- isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [], - ]) ?> -
+ +
- +
Моя страница
+ [ - 'class' => 'menu-content', + 'class' => 'menu-admin', ], - 'activeCssClass' => 'active-menu-content', + 'activeCssClass' => 'active-menu-admin', 'items' => [ [ - 'label' => 'Общее', + 'label' => 'Учетные данные', 'url' => ['accounts/general'], ], [ - 'label' => 'Портфолио', - 'url' => ['accounts/portfolio'], - ], - [ - 'label' => 'Настройка аккаунта', - 'url' => ['accounts/setting'], - ], - [ 'label' => 'Контакты', 'url' => ['accounts/contacts'], ], @@ -44,37 +33,81 @@ $this->beginContent('@app/views/layouts/main.php'); 'url' => ['accounts/service'], ], [ + 'label' => 'Трудовой стаж', + 'url' => ['accounts/'], + ], + [ 'label' => 'Дополнительные навыки', 'url' => ['accounts/add-skills'], ], [ - 'label' => 'Трудовой стаж', - 'url' => ['accounts/employment'], + 'label' => 'Описание', + 'url' => ['accounts/'], + ], + + [ + 'label' => 'Команда', + 'url' => ['accounts/'], + ], + + [ + 'label' => 'Вакансии', + 'url' => ['accounts/'], + ], + [ + 'label' => 'Ваши проекты', + 'url' => ['accounts/'], + ], + [ + 'label' => 'Портфолио', + 'url' => ['accounts/portfolio'], ], + [ - 'label' => 'Проекты', - 'url' => ['accounts/projects'], + 'label' => 'Блог', + 'url' => ['accounts/'], ], [ 'label' => 'Галерея', 'url' => ['accounts/gallery'], ], [ + 'label' => 'Сообщения', + 'url' => ['accounts/'], + ], + [ + 'label' => 'Уведомления о проектах', + 'url' => ['accounts/'], + ], + [ + 'label' => 'Закладки', + 'url' => ['accounts/'], + ], + [ + 'label' => 'Настройка аккаунта', + 'url' => ['accounts/setting'], + ], + [ 'label' => 'Выход', + 'options' => ['class'=>'logout-li'], 'url' => ['/site/logout'] ], +// [ +// 'label' => 'Общее', +// 'options' => ['class'=>'test'], +// 'url' => ['accounts/general'], +// ], ], ]); - ?> + ?> +
+ + +
-
- - -
-
-
-
endContent() ?> \ No newline at end of file diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css index 9ae8858..2ba8fe0 100755 --- a/frontend/web/css/style.css +++ b/frontend/web/css/style.css @@ -4605,6 +4605,7 @@ input.custom-radio + label, input.custom-check + label { font-size: 13px; cursor: pointer; margin-left: 6px; + display: inline; } input.custom-radio:checked + label, input.custom-check:checked + label { color: #0072bc; @@ -5016,4 +5017,66 @@ input.custom-check:checked + label span, input.custom-check:checked + label:hove transition: 0.2s; background: #62b8ef; color: #fff; -} \ No newline at end of file +} + +/***login***/ +.section-box.admin-page {margin-top: 30px} +.login-right-column { + width: 210px; + float: left; + background: #0072bc; + border-radius: 4px; +} +.login-left-column { + width: 700px; + float: right; +} +.admin-my-page { + height: 46px; + color: #fff; + line-height: 46px; + box-sizing: border-box; + padding-left: 15px; + width: 100%; +} +ul.menu-admin{ + width: 100%; + float: left; + padding: 0 0 0 0; + margin: 0; +} +ul.menu-admin li { + width: 100%; + float: left; + list-style: none; + border-top: 1px solid #62b8ef; + box-sizing: border-box; + padding-left: 15px; + height: 29px; +} + +ul.menu-admin li a { + color: #fff; + text-decoration: none; + font-size: 13px; + width: 100%; + display: block; + height: 29px; + line-height: 29px; + position: relative; +} +ul.menu-admin li:hover a{ + color: #62b8ef; + transition: 0.2s; +} +ul.menu-admin li.active-menu-admin {background: #62b8ef;} +ul.menu-admin li.active-menu-admin a{color: #fff} +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{ + height: 34px; + line-height: 34px; +} + + +.login-left-column-title {border-bottom: 1px solid #dbdbdb} +.login-left-column-title, .login-left-column-title h1{font-size: 18px} +.form-group{margin-bottom: 0} \ No newline at end of file -- libgit2 0.21.4