From 0dfdb6ef8c0e59204b29efeabd4cdce42f07ef45 Mon Sep 17 00:00:00 2001
From: icemate <icemate.job@gmail.com>
Date: Fri, 5 Feb 2016 16:06:34 +0200
Subject: [PATCH] tokar commit

---
 frontend/views/accounts/general.php | 157 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------
 frontend/web/css/style.css          |  61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 169 insertions(+), 49 deletions(-)

diff --git a/frontend/views/accounts/general.php b/frontend/views/accounts/general.php
index bb98b11..37bdc00 100755
--- a/frontend/views/accounts/general.php
+++ b/frontend/views/accounts/general.php
@@ -19,78 +19,143 @@
 <div class="login-left-column-title"><?= $this->title ?></div>
 
 <div class="" id="form_definition">
-    <?php  $form = ActiveForm::begin ();
+    <?php  $form = ActiveForm::begin (); ?>
 
 
 
 
-//    echo $form->field ($user, 'isPerformer', ['template' => "{label}:\n{input}\n{hint}\n{error}"])
-//        ->label ('<span></span>Я - исполнитель')
-//        ->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']);
+<!--//     $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">
 
-        echo $form->field ($user, 'isPerformer', ['template' => "{input}\n{label}\n{hint}\n{error}"])
-                  ->label ('<span></span>Я - исполнитель')
-                  ->hint ('Отображается если указать специализации услуг в личном кабинете.')
-                  ->checkbox (['class'=> 'custom-check disabled', 'disabled'=>'disabled'], false);
-        echo $form->field ($user, 'isCustomer', ['template' => "{input}\n{label}\n{hint}\n{error}"])
-                  ->label ('<span></span>Я - заказчик')
-                  ->hint ('Отображается если созданы заказы.')
-                    ->checkbox (['class'=> 'custom-check', 'disabled'=>'disabled'], false);
-        echo $form->field ($user, 'type')
-                  ->label ('Кто вы')
-                  ->radioList ([1 => 'Частное лицо', 2 => 'Компания']);
-        echo $form->field ($company_info, 'name', ['options' => ['class' => 'form-group company_info']])
+            <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,
@@ -99,7 +164,8 @@
             'gallery' =>$user_info->image,
             'name' => 'Загрузить аватар'
         ]);
-        echo ImageUploader::widget([
+        ?>
+        <?= ImageUploader::widget([
             'model'=> $user_info,
             'field'=>'poster',
             'width'=>1200,
@@ -108,7 +174,8 @@
             'gallery' =>$user_info->poster,
             'name' => 'Загрузить постер'
         ]);
-        echo Html::submitButton('Обновить', ['class' => 'btn btn-primary']);
+        ?>
+        <?= Html::submitButton('Обновить', ['class' => 'btn btn-primary']);
         $form->end ();
-    ?>
+        ?>
 </div>
diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css
index 2ba8fe0..9b6cbd9 100755
--- a/frontend/web/css/style.css
+++ b/frontend/web/css/style.css
@@ -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"] {
@@ -4633,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;
@@ -5026,9 +5048,10 @@ input.custom-check:checked + label span, input.custom-check:checked + label:hove
     float: left;
     background: #0072bc;
     border-radius: 4px;
+    margin-left: -10px;
 }
 .login-left-column {
-    width: 700px;
+    width: 720px;
     float: right;
 }
 .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-
 }
 
 
-.login-left-column-title {border-bottom: 1px solid #dbdbdb}
+.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}
\ No newline at end of file
+.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
--
libgit2 0.21.4