tokar commit

Виталий
1 parent c39b07ae
Showing 2 changed files with 78 additions and 27 deletions Show diff stats
frontend/views/accounts/general.php
frontend/web/css/style.css
@@ -124,40 +124,75 @@
                   ->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 class="input-blocks street-input">
+            <?= $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 class="input-blocks home-input">
+            <?= $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 ($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 class="input-blocks hide-mail-check">
+        <?= $form->field ($company_info, 'hide_mail', ['options' => ['class' => 'form-group company_info', ], 'template' => "{input}{label}\n{hint}\n{error}"])
+                  ->label ('<span></span>не публиковать Email')
+                  ->checkbox (['checked'=>'checked', 'class'=> 'custom-check'], false);
         ?>
         </div>
     </div>
+
+    <div class="input-blocks-wrapper">
+        <div class="input-blocks">
+        <div class="general-who-title gen-admin-title">Кто вы:</div>
         <?= $form->field ($user_info, 'busy')
-                  ->label ('Статус')
-                  ->radioList ([0 => 'Свободен', 1 => 'Занят']);
+                  ->label (false)
+                  ->radioList (
+                      [0 => 'Свободен', 1 => 'Занят'],
+                      [
+                          'item' => function($index, $label, $name, $checked, $value) {
+                              $return = '<div class="admin-who-check">';
+                              $return .= '<input class="custom-radio" id="select_admin_status'.$value.'" type="radio" name="' . $name . '" value="' . $value . '" '.($checked ? "checked" :"").' >';
+                              $return .= '<label for="select_admin_status'.$value.'" >';
+                              $return .= '<span></span>' . ucwords($label);
+                              $return .= '</label>';
+                              $return .= '</div>';
+                              return $return;
+                          }
+                      ]
+                  );
         ?>
+        </div>
+    </div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         <?= $form->field ($user_info, 'member')
                   ->label ('Членство в МФП')
                   ->hint ('Выберите если хотите стать членом МФП и наш менеджер свяжется с Вами.')
@@ -4957,13 +4957,7 @@ input.disabled.admin-check:checked + label, input.disabled.admin-check:checked +
 }
  
 .input-blocks .has-success:before {
-    display: block;
-    content: "*";
-    color: #D40000;
-    position: absolute;
-    top: 32px;
-    left: -15px;
-    width: 15px;
+
 }
  
 .form-group.required:after {
@@ -5143,3 +5137,25 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last-
 .admin-who-check input.custom-radio + label span{
     margin-top: 5px;
 }
+.input-blocks.home-input {
+    width: 80px;
+    margin-left: 20px;
+}
+.input-blocks.home-input input{
+    width: 80px;
+}
+.input-blocks.street-input {margin-left: 20px}
+.input-blocks.hide-mail-check {height: 15px;  margin-top: 30px;}
+.input-blocks.hide-mail-check input.custom-check + label{
+    color: #b7b7b7;
+    font-weight: normal;
+}
+.input-blocks.hide-mail-check input.custom-check:checked + label {
+    color: #b7b7b7;
+    border-bottom: none;
+}
+.input-blocks.hide-mail-check input.custom-check + label span {
+    margin-left: 20px;
+    margin-top: 5px;
+}
+.custom-input-2[disabled="disabled"] {background: #f1f1f1}
 \ No newline at end of file