Merge remote-tracking branch 'origin/master'

Administrator
2 parents 83f7b1ab 0dfdb6ef
Showing 3 changed files with 306 additions and 68 deletions Show diff stats
frontend/views/accounts/general.php
frontend/views/layouts/admin.php
frontend/web/css/style.css
@@ -16,59 +16,146 @@
     $this->title = 'Учетные данные';
     $this->params['breadcrumbs'][] = $this->title;
 ?>
-<h1><?= $this->title ?></h1>
+<div class="login-left-column-title"><?= $this->title ?></div>
+
 <div class="" id="form_definition">
-    <?php  $form = ActiveForm::begin ();
-        echo $form->field ($user, 'isPerformer', ['template' => "{label}:\n{input}\n{hint}\n{error}"])
-                  ->label ('<span></span>Я - исполнитель')
-                  ->hint ('Отображается если указать специализации услуг в личном кабинете.')
-                  ->checkbox ([], 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 => 'Компания']);
-        echo $form->field ($company_info, 'name', ['options' => ['class' => 'form-group company_info']])
+    <?php  $form = ActiveForm::begin (); ?>
+
+
+
+
+<!--//     $form->field ($user, 'isPerformer', ['template' => "{label}:\n{input}\n{hint}\n{error}"])-->
+<!--//        ->label ('<span></span>Я - исполнитель')-->
+<!--//        ->hint ('Отображается если указать специализации услуг в личном кабинете.')-->
+<!--//        ->checkbox (['class'=> 'test', 'disabled'=>'disabled'], false);-->
+<!--//     $form->field ($user, 'isCustomer', ['template' => "{label}:\n{input}\n{hint}\n{error}"])-->
+<!--//        ->label ('Я - заказчик')-->
+<!--//        ->hint ('Отображается если созданы заказы.')-->
+<!--//        ->checkbox ([], false);-->
+<!--//     $form->field ($user, 'type')-->
+<!--//        ->label ('Кто вы')-->
+<!--//        ->radioList ([1 => 'Частное лицо', 2 => 'Компания'],['class'=>'test']);-->
+
+
+
+
+
+      
+    <div class="general-check-wr style">
+        <div class="general-check">
+
+            <div class="general-check-left">
+                <?= $form->field ($user, 'isPerformer', ['template' => "{input}\n{label}\n{error}"])
+                    ->label ('<span></span>Я - исполнитель')
+                    ->checkbox (['class'=> 'custom-check disabled admin-check', 'disabled'=>'disabled'], false);
+                ?>
+            </div>
+            <div class="general-check-right">
+                <div class="general-check-right-txt">Обязательно должны быть указаны специализации услуг, что бы вы попали в рейтинг исполнителей</div>
+            </div>
+        </div>
+
+        <div class="general-check">
+            <div class="general-check-left">
+                <?= $form->field ($user, 'isCustomer', ['template' => "{input}\n{label}\n{error}"])
+                    ->label ('<span></span>Я - заказчик')
+                    ->checkbox (['class'=> 'custom-check disabled admin-check', 'disabled'=>'disabled'], false);
+                ?>
+            </div>
+            <div class="general-check-right">
+                <div class="general-check-right-txt">Обязательно должны быть созданы проекты вами, что бы вы попали в рейтинг исполнителей</div>
+            </div>
+        </div>
+
+    </div>
+    <div class="general-who style border-general">
+        <div class="general-who-title gen-admin-title">Кто вы:</div>
+        <?= $form->field ($user, 'type')
+        ->label ('Кто вы')
+        ->radioList ([1 => 'Частное лицо', 2 => 'Компания']);
+        ?>
+
+<!--        --><?//= $form->field ($user, 'type')
+//            ->label (false)
+//            ->radioList (
+//                [1 => 'Male', 0 => 'Female'],
+//                [
+//                    'item' => function($index, $label, $name, $checked, $value) {
+//
+//                        $return = '<label class="modal-radio">';
+//                        $return .= '<input type="radio" name="' . $name . '" value="' . $value . '" tabindex="3">';
+//                        $return .= '<i></i>';
+//                        $return .= '<span>' . ucwords($label) . '</span>';
+//                        $return .= '</label>';
+//
+//                        return $return;
+//                    }
+//                ]
+//            );
+//        ?>
+
+
+    </div>
+
+        <?= $form->field ($company_info, 'name', ['options' => ['class' => 'form-group company_info']])
                   ->label ('Название компании')
                   ->textInput ();
-        echo $form->field ($company_info, 'staff', ['options' => ['class' => 'form-group company_info']])
+        ?>
+        <?= $form->field ($company_info, 'staff', ['options' => ['class' => 'form-group company_info']])
                   ->label ('Количество сотрудников')
                   ->input ('number');
-        echo '<div class="company_info">Контакты представителя</div>';
-        echo $form->field ($user, 'lastname')
-                  ->label ('Фамилия')
-                  ->textInput ();
-        echo $form->field ($user, 'firstname')
-                  ->label ('Имя')
-                  ->textInput ();
-        echo $form->field ($user_info, 'country')
+        ?>
+        <?= '<div class="company_info">Контакты представителя</div>';
+        ?>
+
+
+    <div class="input-blocks-wrapper">
+        <div class="input-blocks">
+            <?= $form->field ($user, 'firstname')
+                ->label ('Имя')
+                ->textInput ();
+            ?>
+        </div>
+    </div>
+
+        <?= $form->field ($user, 'lastname')
+            ->label ('Фамилия')
+            ->textInput ();
+        ?>
+        <?= $form->field ($user_info, 'country')
                   ->label ('Ваша страна')
                   ->textInput ();
-        echo $form->field ($user_info, 'city')
+        ?>
+        <?= $form->field ($user_info, 'city')
                   ->label ('Ваш город')
                   ->textInput ();
-        echo $form->field ($company_info, 'street', ['options' => ['class' => 'form-group company_info']])
+        ?>
+        <?= $form->field ($company_info, 'street', ['options' => ['class' => 'form-group company_info']])
                   ->label ('Улица')
                   ->textInput ();
-        echo $form->field ($company_info, 'house', ['options' => ['class' => 'form-group company_info']])
+        ?>
+        <?= $form->field ($company_info, 'house', ['options' => ['class' => 'form-group company_info']])
                   ->label ('Дом')
                   ->textInput ();
-        echo $form->field ($user, 'email')
+        ?>
+        <?= $form->field ($user, 'email')
                   ->label ('Email')
                   ->textInput (['disabled' => 'disabled']);
-        echo $form->field ($company_info, 'hide_mail', ['options' => ['class' => 'form-group company_info'], 'template' => "{input}{label}\n{hint}\n{error}"])
+        ?>
+        <?= $form->field ($company_info, 'hide_mail', ['options' => ['class' => 'form-group company_info'], 'template' => "{input}{label}\n{hint}\n{error}"])
                   ->label ('Не публиковать Email')
-                  ->checkbox ([], false);
-        echo $form->field ($user_info, 'busy')
+                  ->checkbox (['checked'=>'checked'], false);
+        ?>
+        <?= $form->field ($user_info, 'busy')
                   ->label ('Статус')
                   ->radioList ([0 => 'Свободен', 1 => 'Занят']);
-        echo $form->field ($user_info, 'member')
+        ?>
+        <?= $form->field ($user_info, 'member')
                   ->label ('Членство в МФП')
                   ->hint ('Выберите если хотите стать членом МФП и наш менеджер свяжется с Вами.')
                   ->radioList ([0 => 'Не хочу', 1 => 'Хочу стать']);
-        echo ImageUploader::widget([
+        ?>
+        <?= ImageUploader::widget([
             'model'=> $user_info,
             'field'=>'image',
             'width'=>100,
@@ -77,7 +164,8 @@
             'gallery' =>$user_info->image,
             'name' => 'Загрузить аватар'
         ]);
-        echo ImageUploader::widget([
+        ?>
+        <?= ImageUploader::widget([
             'model'=> $user_info,
             'field'=>'poster',
             'width'=>1200,
@@ -86,7 +174,8 @@
             'gallery' =>$user_info->poster,
             'name' => 'Загрузить постер'
         ]);
-        echo Html::submitButton('Обновить', ['class' => 'btn btn-primary']);
+        ?>
+        <?= Html::submitButton('Обновить', ['class' => 'btn btn-primary']);
         $form->end ();
-    ?>
+        ?>
 </div>
@@ -7,35 +7,24 @@ use yii\widgets\Menu;
 /* @var $content string */
 $this->beginContent('@app/views/layouts/main.php');
 ?>
-    <div class="wrap">
-        <div class="container">
-            <div class="right_block">
-                <?= Breadcrumbs::widget([
-                    'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
-                ]) ?>
-                <div class="section-box menu-content-wr">
+
+<div class="section-box admin-page">
                     <div class="box-wr">
                         <div class="box-all">
-                            <?php
+                            <div class="login-right-column">
+                                <div class="admin-my-page">Моя страница</div>
+                                <?php
                                 echo Menu::widget([
                                     'options' => [
-                                        '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-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
                                             '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'],
+//                                        ],
                                     ],
                                 ]);
-                            ?>
+                                ?>
+                            </div>
+
+                            <div class="login-left-column">
+                                <?= $content ?>
+                            </div>
+
                         </div>
                     </div>
                 </div>
-                <div class="menu-location-index">
-                    <?= $content ?>
-
-                </div>
-            </div>
-        </div>
-    </div>
 <?php $this->endContent() ?>
 \ No newline at end of file
@@ -11,7 +11,10 @@ body {
 img {
     border: none;
 }
-
+label {
+    margin-bottom: 0;
+    font-weight: 400;
+}
 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}
 input, textarea{color: #777}
 [class*="section-box"] {
@@ -4605,6 +4608,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;
@@ -4632,6 +4636,25 @@ input.custom-check + label span {
 input.custom-check:checked + label span, input.custom-check:checked + label:hover span {
     background: url(/images/sets-ico/check-active.png) no-repeat;transition: .2s;
 }
+
+input.admin-check + label span {
+    width: 12px;
+    height: 12px;
+    background: url(/images/sets-ico/check.png) no-repeat;
+    float: left;
+    margin-left: 0;
+}
+input.disabled.admin-check:checked + label span, input.disabled.admin-check:checked + label:hover span {
+    background: #dcdcdc url(/images/check-disable.png) no-repeat;transition: .2s;
+}
+input.disabled.admin-check + label span, input.disabled.admin-check + label:hover span {
+    background: #dcdcdc;transition: .2s;
+}
+input.disabled.admin-check:checked + label, input.disabled.admin-check:checked + label:hover {
+    color: inherit;
+    border-bottom: none;
+    cursor: default;
+}
 .check-radio-wr {
     width: 50%;
     float: left;
@@ -5016,4 +5039,97 @@ 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;
+    margin-left: -10px;
+}
+.login-left-column {
+    width: 720px;
+    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;  margin-top: 15px;  padding-bottom: 23px;}
+.login-left-column-title,  .login-left-column-title h1{font-size: 18px}
+.form-group{margin-bottom: 0}
+.border-general {
+    border-bottom: 1px solid #dbdbdb;
+}
+.general-check-wr {padding-top: 20px}
+.general-check-left {
+    width: 120px;
+    position: absolute;
+    top: 50%;
+    margin-top: -10px;
+    left: 0;
+    height: 21px;
+}
+.general-check-right {
+    width: 595px;
+    float: right;
+}
+.general-check {  height: 30px; position: relative }
+.general-check-right-txt {
+    font-size: 13px;
+    color: #b7b7b7;
+    display: table-cell;
+    vertical-align: middle;
+    height: 19px;
+}
+
+.gen-admin-title {
+    font-size: 18px;
+    color: inherit;
+}
+.general-who-title {margin-top: 49px}
 \ No newline at end of file