Administrator / test_3

Commit 770925294ed697b0a9e99252d928a9ef426f756b

Authored by Administrator
2 parents 83f7b1ab 0dfdb6ef

Merge remote-tracking branch 'origin/master'

Showing 3 changed files with 306 additions and 68 deletions   Show diff stats
Inline Side-by-side
frontend/views/accounts/general.php
  Show/Hide comments   View file @7709252
... ... @@ -16,59 +16,146 @@
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   - <?php $form = ActiveForm::begin ();
22   - echo $form->field ($user, 'isPerformer', ['template' => "{label}:\n{input}\n{hint}\n{error}"])
23   - ->label ('<span></span>Я - исполнитель')
24   - ->hint ('Отображается если указать специализации услуг в личном кабинете.')
25   - ->checkbox ([], false);
26   - echo $form->field ($user, 'isCustomer', ['template' => "{label}:\n{input}\n{hint}\n{error}"])
27   - ->label ('Я - заказчик')
28   - ->hint ('Отображается если созданы заказы.')
29   - ->checkbox ([], false);
30   - echo $form->field ($user, 'type')
31   - ->label ('Кто вы')
32   - ->radioList ([1 => 'Частное лицо', 2 => 'Компания']);
33   - echo $form->field ($company_info, 'name', ['options' => ['class' => 'form-group company_info']])
  22 + <?php $form = ActiveForm::begin (); ?>
  23 +
  24 +
  25 +
  26 +
  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 +
  39 +
  40 +
  41 +
  42 +
  43 +
  44 + <div class="general-check-wr style">
  45 + <div class="general-check">
  46 +
  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']])
34 101 ->label ('Название компании')
35 102 ->textInput ();
36   - 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']])
37 105 ->label ('Количество сотрудников')
38 106 ->input ('number');
39   - echo '<div class="company_info">Контакты представителя</div>';
40   - echo $form->field ($user, 'lastname')
41   - ->label ('Фамилия')
42   - ->textInput ();
43   - echo $form->field ($user, 'firstname')
44   - ->label ('Имя')
45   - ->textInput ();
46   - 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')
47 126 ->label ('Ваша страна')
48 127 ->textInput ();
49   - echo $form->field ($user_info, 'city')
  128 + ?>
  129 + <?= $form->field ($user_info, 'city')
50 130 ->label ('Ваш город')
51 131 ->textInput ();
52   - 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']])
53 134 ->label ('Улица')
54 135 ->textInput ();
55   - 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']])
56 138 ->label ('Дом')
57 139 ->textInput ();
58   - echo $form->field ($user, 'email')
  140 + ?>
  141 + <?= $form->field ($user, 'email')
59 142 ->label ('Email')
60 143 ->textInput (['disabled' => 'disabled']);
61   - 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}"])
62 146 ->label ('Не публиковать Email')
63   - ->checkbox ([], false);
64   - echo $form->field ($user_info, 'busy')
  147 + ->checkbox (['checked'=>'checked'], false);
  148 + ?>
  149 + <?= $form->field ($user_info, 'busy')
65 150 ->label ('Статус')
66 151 ->radioList ([0 => 'Свободен', 1 => 'Занят']);
67   - echo $form->field ($user_info, 'member')
  152 + ?>
  153 + <?= $form->field ($user_info, 'member')
68 154 ->label ('Членство в МФП')
69 155 ->hint ('Выберите если хотите стать членом МФП и наш менеджер свяжется с Вами.')
70 156 ->radioList ([0 => 'Не хочу', 1 => 'Хочу стать']);
71   - echo ImageUploader::widget([
  157 + ?>
  158 + <?= ImageUploader::widget([
72 159 'model'=> $user_info,
73 160 'field'=>'image',
74 161 'width'=>100,
... ... @@ -77,7 +164,8 @@
77 164 'gallery' =>$user_info->image,
78 165 'name' => 'Загрузить аватар'
79 166 ]);
80   - echo ImageUploader::widget([
  167 + ?>
  168 + <?= ImageUploader::widget([
81 169 'model'=> $user_info,
82 170 'field'=>'poster',
83 171 'width'=>1200,
... ... @@ -86,7 +174,8 @@
86 174 'gallery' =>$user_info->poster,
87 175 'name' => 'Загрузить постер'
88 176 ]);
89   - echo Html::submitButton('Обновить', ['class' => 'btn btn-primary']);
  177 + ?>
  178 + <?= Html::submitButton('Обновить', ['class' => 'btn btn-primary']);
90 179 $form->end ();
91   - ?>
  180 + ?>
92 181 </div>
... ...
frontend/views/layouts/admin.php
  Show/Hide comments   View file @7709252
... ... @@ -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-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
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
  Show/Hide comments   View file @7709252
... ... @@ -11,7 +11,10 @@ body {
11 11 img {
12 12 border: none;
13 13 }
14   -
  14 +label {
  15 + margin-bottom: 0;
  16 + font-weight: 400;
  17 +}
15 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 19 input, textarea{color: #777}
17 20 [class*="section-box"] {
... ... @@ -4605,6 +4608,7 @@ input.custom-radio + label, input.custom-check + label {
4605 4608 font-size: 13px;
4606 4609 cursor: pointer;
4607 4610 margin-left: 6px;
  4611 + display: inline;
4608 4612 }
4609 4613 input.custom-radio:checked + label, input.custom-check:checked + label {
4610 4614 color: #0072bc;
... ... @@ -4632,6 +4636,25 @@ input.custom-check + label span {
4632 4636 input.custom-check:checked + label span, input.custom-check:checked + label:hover span {
4633 4637 background: url(/images/sets-ico/check-active.png) no-repeat;transition: .2s;
4634 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 +}
4635 4658 .check-radio-wr {
4636 4659 width: 50%;
4637 4660 float: left;
... ... @@ -5016,4 +5039,97 @@ input.custom-check:checked + label span, input.custom-check:checked + label:hove
5016 5039 transition: 0.2s;
5017 5040 background: #62b8ef;
5018 5041 color: #fff;
5019   -}
5020 5042 \ No newline at end of file
  5043 +}
  5044 +
  5045 +/***login***/
  5046 +.section-box.admin-page {margin-top: 30px}
  5047 +.login-right-column {
  5048 + width: 210px;
  5049 + float: left;
  5050 + background: #0072bc;
  5051 + border-radius: 4px;
  5052 + margin-left: -10px;
  5053 +}
  5054 +.login-left-column {
  5055 + width: 720px;
  5056 + float: right;
  5057 +}
  5058 +.admin-my-page {
  5059 + height: 46px;
  5060 + color: #fff;
  5061 + line-height: 46px;
  5062 + box-sizing: border-box;
  5063 + padding-left: 15px;
  5064 + width: 100%;
  5065 +}
  5066 +ul.menu-admin{
  5067 + width: 100%;
  5068 + float: left;
  5069 + padding: 0 0 0 0;
  5070 + margin: 0;
  5071 +}
  5072 +ul.menu-admin li {
  5073 + width: 100%;
  5074 + float: left;
  5075 + list-style: none;
  5076 + border-top: 1px solid #62b8ef;
  5077 + box-sizing: border-box;
  5078 + padding-left: 15px;
  5079 + height: 29px;
  5080 +}
  5081 +
  5082 +ul.menu-admin li a {
  5083 + color: #fff;
  5084 + text-decoration: none;
  5085 + font-size: 13px;
  5086 + width: 100%;
  5087 + display: block;
  5088 + height: 29px;
  5089 + line-height: 29px;
  5090 + position: relative;
  5091 +}
  5092 +ul.menu-admin li:hover a{
  5093 + color: #62b8ef;
  5094 + transition: 0.2s;
  5095 +}
  5096 +ul.menu-admin li.active-menu-admin {background: #62b8ef;}
  5097 +ul.menu-admin li.active-menu-admin a{color: #fff}
  5098 +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{
  5099 + height: 34px;
  5100 + line-height: 34px;
  5101 +}
  5102 +
  5103 +
  5104 +.login-left-column-title {border-bottom: 1px solid #dbdbdb; margin-top: 15px; padding-bottom: 23px;}
  5105 +.login-left-column-title, .login-left-column-title h1{font-size: 18px}
  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}
5021 5137 \ No newline at end of file
... ...