From b9769b494c1733deada7d6879c95e118a66052b6 Mon Sep 17 00:00:00 2001
From: icemate <icemate.job@gmail.com>
Date: Fri, 5 Feb 2016 17:43:11 +0200
Subject: [PATCH] tokar commit

---
 frontend/views/accounts/general.php | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------
 frontend/web/css/style.css          | 14 ++++++++++++--
 2 files changed, 65 insertions(+), 41 deletions(-)

diff --git a/frontend/views/accounts/general.php b/frontend/views/accounts/general.php
index 738faf8..852885f 100755
--- a/frontend/views/accounts/general.php
+++ b/frontend/views/accounts/general.php
@@ -21,26 +21,6 @@
 <div class="" id="form_definition">
     <?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">
 
@@ -77,11 +57,12 @@
                 [1 => 'Частное лицо', 2 => 'Компания'],
                 [
                     'item' => function($index, $label, $name, $checked, $value) {
-                        $return = '<input id="select_admin_'.$value.'" type="radio" name="' . $name . '" value="' . $value . '" '.($checked ? "checked" :"").' >';
+                        $return = '<div class="admin-who-check">';
+                        $return .= '<input class="custom-radio" id="select_admin_'.$value.'" type="radio" name="' . $name . '" value="' . $value . '" '.($checked ? "checked" :"").' >';
                         $return .= '<label for="select_admin_'.$value.'" >';
                         $return .= '<span></span>' . ucwords($label);
                         $return .= '</label>';
-
+                        $return .= '</div>';
                         return $return;
                     }
                 ]
@@ -90,56 +71,85 @@
 
 
     </div>
-
+    <div class="input-blocks-wrapper">
+        <div class="input-blocks">
         <?= $form->field ($company_info, 'name', ['options' => ['class' => 'form-group company_info']])
                   ->label ('Название компании')
-                  ->textInput ();
+                  ->textInput (['class'=> 'custom-input-2']);
         ?>
+        </div>
+    </div>
+    <div class="input-blocks-wrapper">
+        <div class="input-blocks">
         <?= $form->field ($company_info, 'staff', ['options' => ['class' => 'form-group company_info']])
                   ->label ('Количество сотрудников')
-                  ->input ('number');
+                  ->textInput (['class'=> 'custom-input-2','type'=>'number']);
         ?>
-        <?= '<div class="company_info">Контакты представителя</div>';
-        ?>
-
+        </div>
+    </div>
 
     <div class="input-blocks-wrapper">
         <div class="input-blocks">
             <?= $form->field ($user, 'firstname')
                 ->label ('Имя')
-                ->textInput ();
+                ->textInput (['class'=> 'custom-input-2']);
             ?>
         </div>
     </div>
 
-        <?= $form->field ($user, 'lastname')
-            ->label ('Фамилия')
-            ->textInput ();
-        ?>
+    <div class="input-blocks-wrapper">
+        <div class="input-blocks">
+            <?= $form->field ($user, 'lastname')
+                ->label ('Фамилия')
+                ->textInput (['class'=> 'custom-input-2']);
+            ?>
+        </div>
+    </div>
+    <div class="input-blocks-wrapper">
+        <div class="input-blocks">
         <?= $form->field ($user_info, 'country')
                   ->label ('Ваша страна')
-                  ->textInput ();
+                  ->textInput (['class'=> 'custom-input-2']);
         ?>
+        </div>
+    </div>
+    <div class="input-blocks-wrapper">
+        <div class="input-blocks">
         <?= $form->field ($user_info, 'city')
                   ->label ('Ваш город')
-                  ->textInput ();
+                  ->textInput (['class'=> 'custom-input-2']);
         ?>
+        </div>
+    </div>
+    <div class="input-blocks-wrapper">
+        <div class="input-blocks">
         <?= $form->field ($company_info, 'street', ['options' => ['class' => 'form-group company_info']])
                   ->label ('Улица')
-                  ->textInput ();
+                  ->textInput (['class'=> 'custom-input-2']);
         ?>
+        </div>
+    </div>
+    <div class="input-blocks-wrapper">
+        <div class="input-blocks">
         <?= $form->field ($company_info, 'house', ['options' => ['class' => 'form-group company_info']])
                   ->label ('Дом')
-                  ->textInput ();
+                  ->textInput (['class'=> 'custom-input-2']);
         ?>
+        </div>
+    </div>
+    <div class="input-blocks-wrapper">
+        <div class="input-blocks">
         <?= $form->field ($user, 'email')
                   ->label ('Email')
-                  ->textInput (['disabled' => 'disabled']);
+                  ->textInput (['class'=> 'custom-input-2','disabled' => 'disabled']);
         ?>
+
         <?= $form->field ($company_info, 'hide_mail', ['options' => ['class' => 'form-group company_info'], 'template' => "{input}{label}\n{hint}\n{error}"])
                   ->label ('Не публиковать Email')
                   ->checkbox (['checked'=>'checked'], false);
         ?>
+        </div>
+    </div>
         <?= $form->field ($user_info, 'busy')
                   ->label ('Статус')
                   ->radioList ([0 => 'Свободен', 1 => 'Занят']);
@@ -169,7 +179,11 @@
             'name' => 'Загрузить постер'
         ]);
         ?>
-        <?= Html::submitButton('Обновить', ['class' => 'btn btn-primary']);
+    <div class="input-blocks-wrapper">
+        <div class="input-blocks">
+        <?= Html::submitButton('Обновить', ['class' => 'input-blocks-wrapper button']);
         $form->end ();
         ?>
+        </div>
+    </div>
 </div>
diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css
index 9b6cbd9..2a51e7e 100755
--- a/frontend/web/css/style.css
+++ b/frontend/web/css/style.css
@@ -5105,6 +5105,7 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last-
 .form-group{margin-bottom: 0}
 .border-general {
     border-bottom: 1px solid #dbdbdb;
+    padding-bottom: 27px;
 }
 .general-check-wr {padding-top: 20px}
 .general-check-left {
@@ -5127,9 +5128,18 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last-
     vertical-align: middle;
     height: 19px;
 }
-
+.general-check input.custom-check + label span {margin-top: 4px;}
 .gen-admin-title {
     font-size: 18px;
     color: inherit;
 }
-.general-who-title {margin-top: 49px}
\ No newline at end of file
+.general-who-title {margin-top: 49px}
+.admin-who-check {
+    height: 21px;
+    width: 100%;
+    float: left;
+    margin-top: 4px;
+}
+.admin-who-check input.custom-radio + label span{
+    margin-top: 5px;
+}
--
libgit2 0.21.4