Merge remote-tracking branch 'origin/master'

# Conflicts: # frontend/views/accounts/general.php

Merge remote-tracking branch 'origin/master'
# Conflicts: # frontend/views/accounts/general.php
Yarik
2 parents 766bd93b b9769b49
Showing 4 changed files with 142 additions and 88 deletions Show diff stats
backend/web/js/option.js
common/config/.gitignore
frontend/views/accounts/general.php
frontend/web/css/style.css
@@ -17,6 +17,7 @@ function checkboxerInit() {
         $(value).trigger('change');
     });
 }
+
 function accountRedraw() {
     var type = $('input[name="User[type]"]:checked').val();
     console.log(type);
@@ -26,6 +27,7 @@ function accountRedraw() {
         $('#form_definition').addClass('form_for_company');
     }
 }
+
 $(function() {
     var counter = 0;
     $(document).on('click', '.add_row', function() {
 /params-local.php
-/main-local.php
-/main-remote.php
 \ No newline at end of file
+/main-local.php
 \ No newline at end of file
@@ -14,12 +14,13 @@
     use \common\widgets\MultiLangForm;
  
     $this->title = 'Учетные данные';
-    $this->params[ 'breadcrumbs' ][] = $this->title;
+    $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="login-left-column-title"><?= $this->title ?></div>
  
 <div class="" id="form_definition">
     <?php $form = ActiveForm::begin(); ?>
+
     <div class="general-check-wr style">
         <div class="general-check">
  
@@ -54,97 +55,139 @@
     <div class="general-who style border-general">
         <div class="general-who-title gen-admin-title">Кто вы:</div>
  
-        <?= $form->field($user, 'type')
-                 ->label(false)
-                 ->radioList([
-                     1 => 'Частное лицо',
-                     2 => 'Компания',
-                 ], [
-                         'item' => function($index, $label, $name, $checked, $value) {
-                             $return = '<label>';
-                             $return .= '<input type="radio" name="' . $name . '" value="' . $value . '" ' . ( $checked ? "checked" : "" ) . ' >';
-                             $return .= '<span></span>' . ucwords($label);
-                             $return .= '</label>';
-
-                             return $return;
-                         },
-                     ]); ?>
+        <?= $form->field ($user, 'type')
+            ->label (false)
+            ->radioList (
+                [1 => 'Частное лицо', 2 => 'Компания'],
+                [
+                    'item' => function($index, $label, $name, $checked, $value) {
+                        $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;
+                    }
+                ]
+            );
+        ?>
  
  
     </div>
+    <div class="input-blocks-wrapper">
+        <div class="input-blocks">
+        <?= $form->field ($company_info, 'name', ['options' => ['class' => 'form-group company_info']])
+                  ->label ('Название компании')
+                  ->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 ('Количество сотрудников')
+                  ->textInput (['class'=> 'custom-input-2','type'=>'number']);
+        ?>
+        </div>
+    </div>
  
-    <?= $form->field($company_info, 'name', [ 'options' => [ 'class' => 'form-group company_info' ] ])
-             ->label('Название компании')
-             ->textInput(); ?>
-    <?= $form->field($company_info, 'staff', [ 'options' => [ 'class' => 'form-group company_info' ] ])
-             ->label('Количество сотрудников')
-             ->input('number'); ?>
-    <?= '<div class="company_info">Контакты представителя</div>'; ?>
-
+    <div class="input-blocks-wrapper">
+        <div class="input-blocks">
+            <?= $form->field ($user, 'firstname')
+                ->label ('Имя')
+                ->textInput (['class'=> 'custom-input-2']);
+            ?>
+        </div>
+    </div>
  
     <div class="input-blocks-wrapper">
         <div class="input-blocks">
-            <?= $form->field($user, 'firstname')
-                     ->label('Имя')
-                     ->textInput(); ?>
+            <?= $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 (['class'=> 'custom-input-2']);
+        ?>
+        </div>
+    </div>
+    <div class="input-blocks-wrapper">
+        <div class="input-blocks">
+        <?= $form->field ($user_info, 'city')
+                  ->label ('Ваш город')
+                  ->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 (['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 (['class'=> 'custom-input-2']);
+        ?>
+        </div>
+    </div>
+    <div class="input-blocks-wrapper">
+        <div class="input-blocks">
+        <?= $form->field ($user, 'email')
+                  ->label ('Email')
+                  ->textInput (['class'=> 'custom-input-2','disabled' => 'disabled']);
+        ?>
  
-    <?= $form->field($user, 'lastname')
-             ->label('Фамилия')
-             ->textInput(); ?>
-    <?= $form->field($user_info, 'country')
-             ->label('Ваша страна')
-             ->textInput(); ?>
-    <?= $form->field($user_info, 'city')
-             ->label('Ваш город')
-             ->textInput(); ?>
-    <?= $form->field($company_info, 'street', [ 'options' => [ 'class' => 'form-group company_info' ] ])
-             ->label('Улица')
-             ->textInput(); ?>
-    <?= $form->field($company_info, 'house', [ 'options' => [ 'class' => 'form-group company_info' ] ])
-             ->label('Дом')
-             ->textInput(); ?>
-    <?= $form->field($user, 'email')
-             ->label('Email')
-             ->textInput([ '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); ?>
-    <?= $form->field($user_info, 'busy')
-             ->label('Статус')
-             ->radioList([
-                 0 => 'Свободен',
-                 1 => 'Занят',
-             ]); ?>
-    <?= $form->field($user_info, 'member')
-             ->label('Членство в МФП')
-             ->hint('Выберите если хотите стать членом МФП и наш менеджер свяжется с Вами.')
-             ->radioList([
-                 0 => 'Не хочу',
-                 1 => 'Хочу стать',
-             ]); ?>
-    <?= ImageUploader::widget([
-        'model'   => $user_info,
-        'field'   => 'image',
-        'width'   => 100,
-        'height'  => 100,
-        'multi'   => false,
-        'gallery' => $user_info->image,
-        'name'    => 'Загрузить аватар',
-    ]); ?>
-    <?= ImageUploader::widget([
-        'model'   => $user_info,
-        'field'   => 'poster',
-        'width'   => 1200,
-        'height'  => 600,
-        'multi'   => false,
-        'gallery' => $user_info->poster,
-        'name'    => 'Загрузить постер',
-    ]); ?>
-    <?= Html::submitButton('Обновить', [ 'class' => 'btn btn-primary' ]);
-        $form->end(); ?>
+        <?= $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 => 'Занят']);
+        ?>
+        <?= $form->field ($user_info, 'member')
+                  ->label ('Членство в МФП')
+                  ->hint ('Выберите если хотите стать членом МФП и наш менеджер свяжется с Вами.')
+                  ->radioList ([0 => 'Не хочу', 1 => 'Хочу стать']);
+        ?>
+        <?= ImageUploader::widget([
+            'model'=> $user_info,
+            'field'=>'image',
+            'width'=>100,
+            'height'=>100,
+            'multi'=>false,
+            'gallery' =>$user_info->image,
+            'name' => 'Загрузить аватар'
+        ]);
+        ?>
+        <?= ImageUploader::widget([
+            'model'=> $user_info,
+            'field'=>'poster',
+            'width'=>1200,
+            'height'=>600,
+            'multi'=>false,
+            'gallery' =>$user_info->poster,
+            'name' => 'Загрузить постер'
+        ]);
+        ?>
+    <div class="input-blocks-wrapper">
+        <div class="input-blocks">
+        <?= Html::submitButton('Обновить', ['class' => 'input-blocks-wrapper button']);
+        $form->end ();
+        ?>
+        </div>
+    </div>
 </div>
@@ -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;
+}