Administrator / test_3

Commit b9769b494c1733deada7d6879c95e118a66052b6

Authored by Виталий
1 parent c8ee4f73

tokar commit

Showing 2 changed files with 65 additions and 41 deletions   Show diff stats
Inline Side-by-side
frontend/views/accounts/general.php
  Show/Hide comments   View file @b9769b4
... ... @@ -21,26 +21,6 @@
21 21 <div class="" id="form_definition">
22 22 <?php $form = ActiveForm::begin (); ?>
23 23  
24   -
25   -
26   -
27   -<!--// $form->field ($user, 'isPerformer', ['template' => "{label}:\n{input}\n{hint}\n{error}"])-->
28   -<!--// ->label ('<span></span>Я - исполнитель')-->
29   -<!--// ->hint ('Отображается если указать специализации услуг в личном кабинете.')-->
30   -<!--// ->checkbox (['class'=> 'test', 'disabled'=>'disabled'], false);-->
31   -<!--// $form->field ($user, 'isCustomer', ['template' => "{label}:\n{input}\n{hint}\n{error}"])-->
32   -<!--// ->label ('Я - заказчик')-->
33   -<!--// ->hint ('Отображается если созданы заказы.')-->
34   -<!--// ->checkbox ([], false);-->
35   -<!--// $form->field ($user, 'type')-->
36   -<!--// ->label ('Кто вы')-->
37   -<!--// ->radioList ([1 => 'Частное лицо', 2 => 'Компания'],['class'=>'test']);-->
38   -
39   -
40   -
41   -
42   -
43   -
44 24 <div class="general-check-wr style">
45 25 <div class="general-check">
46 26  
... ... @@ -77,11 +57,12 @@
77 57 [1 => 'Частное лицо', 2 => 'Компания'],
78 58 [
79 59 'item' => function($index, $label, $name, $checked, $value) {
80   - $return = '<input id="select_admin_'.$value.'" type="radio" name="' . $name . '" value="' . $value . '" '.($checked ? "checked" :"").' >';
  60 + $return = '<div class="admin-who-check">';
  61 + $return .= '<input class="custom-radio" id="select_admin_'.$value.'" type="radio" name="' . $name . '" value="' . $value . '" '.($checked ? "checked" :"").' >';
81 62 $return .= '<label for="select_admin_'.$value.'" >';
82 63 $return .= '<span></span>' . ucwords($label);
83 64 $return .= '</label>';
84   -
  65 + $return .= '</div>';
85 66 return $return;
86 67 }
87 68 ]
... ... @@ -90,56 +71,85 @@
90 71  
91 72  
92 73 </div>
93   -
  74 + <div class="input-blocks-wrapper">
  75 + <div class="input-blocks">
94 76 <?= $form->field ($company_info, 'name', ['options' => ['class' => 'form-group company_info']])
95 77 ->label ('Название компании')
96   - ->textInput ();
  78 + ->textInput (['class'=> 'custom-input-2']);
97 79 ?>
  80 + </div>
  81 + </div>
  82 + <div class="input-blocks-wrapper">
  83 + <div class="input-blocks">
98 84 <?= $form->field ($company_info, 'staff', ['options' => ['class' => 'form-group company_info']])
99 85 ->label ('Количество сотрудников')
100   - ->input ('number');
  86 + ->textInput (['class'=> 'custom-input-2','type'=>'number']);
101 87 ?>
102   - <?= '<div class="company_info">Контакты представителя</div>';
103   - ?>
104   -
  88 + </div>
  89 + </div>
105 90  
106 91 <div class="input-blocks-wrapper">
107 92 <div class="input-blocks">
108 93 <?= $form->field ($user, 'firstname')
109 94 ->label ('Имя')
110   - ->textInput ();
  95 + ->textInput (['class'=> 'custom-input-2']);
111 96 ?>
112 97 </div>
113 98 </div>
114 99  
115   - <?= $form->field ($user, 'lastname')
116   - ->label ('Фамилия')
117   - ->textInput ();
118   - ?>
  100 + <div class="input-blocks-wrapper">
  101 + <div class="input-blocks">
  102 + <?= $form->field ($user, 'lastname')
  103 + ->label ('Фамилия')
  104 + ->textInput (['class'=> 'custom-input-2']);
  105 + ?>
  106 + </div>
  107 + </div>
  108 + <div class="input-blocks-wrapper">
  109 + <div class="input-blocks">
119 110 <?= $form->field ($user_info, 'country')
120 111 ->label ('Ваша страна')
121   - ->textInput ();
  112 + ->textInput (['class'=> 'custom-input-2']);
122 113 ?>
  114 + </div>
  115 + </div>
  116 + <div class="input-blocks-wrapper">
  117 + <div class="input-blocks">
123 118 <?= $form->field ($user_info, 'city')
124 119 ->label ('Ваш город')
125   - ->textInput ();
  120 + ->textInput (['class'=> 'custom-input-2']);
126 121 ?>
  122 + </div>
  123 + </div>
  124 + <div class="input-blocks-wrapper">
  125 + <div class="input-blocks">
127 126 <?= $form->field ($company_info, 'street', ['options' => ['class' => 'form-group company_info']])
128 127 ->label ('Улица')
129   - ->textInput ();
  128 + ->textInput (['class'=> 'custom-input-2']);
130 129 ?>
  130 + </div>
  131 + </div>
  132 + <div class="input-blocks-wrapper">
  133 + <div class="input-blocks">
131 134 <?= $form->field ($company_info, 'house', ['options' => ['class' => 'form-group company_info']])
132 135 ->label ('Дом')
133   - ->textInput ();
  136 + ->textInput (['class'=> 'custom-input-2']);
134 137 ?>
  138 + </div>
  139 + </div>
  140 + <div class="input-blocks-wrapper">
  141 + <div class="input-blocks">
135 142 <?= $form->field ($user, 'email')
136 143 ->label ('Email')
137   - ->textInput (['disabled' => 'disabled']);
  144 + ->textInput (['class'=> 'custom-input-2','disabled' => 'disabled']);
138 145 ?>
  146 +
139 147 <?= $form->field ($company_info, 'hide_mail', ['options' => ['class' => 'form-group company_info'], 'template' => "{input}{label}\n{hint}\n{error}"])
140 148 ->label ('Не публиковать Email')
141 149 ->checkbox (['checked'=>'checked'], false);
142 150 ?>
  151 + </div>
  152 + </div>
143 153 <?= $form->field ($user_info, 'busy')
144 154 ->label ('Статус')
145 155 ->radioList ([0 => 'Свободен', 1 => 'Занят']);
... ... @@ -169,7 +179,11 @@
169 179 'name' => 'Загрузить постер'
170 180 ]);
171 181 ?>
172   - <?= Html::submitButton('Обновить', ['class' => 'btn btn-primary']);
  182 + <div class="input-blocks-wrapper">
  183 + <div class="input-blocks">
  184 + <?= Html::submitButton('Обновить', ['class' => 'input-blocks-wrapper button']);
173 185 $form->end ();
174 186 ?>
  187 + </div>
  188 + </div>
175 189 </div>
... ...
frontend/web/css/style.css
  Show/Hide comments   View file @b9769b4
... ... @@ -5105,6 +5105,7 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last-
5105 5105 .form-group{margin-bottom: 0}
5106 5106 .border-general {
5107 5107 border-bottom: 1px solid #dbdbdb;
  5108 + padding-bottom: 27px;
5108 5109 }
5109 5110 .general-check-wr {padding-top: 20px}
5110 5111 .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-
5127 5128 vertical-align: middle;
5128 5129 height: 19px;
5129 5130 }
5130   -
  5131 +.general-check input.custom-check + label span {margin-top: 4px;}
5131 5132 .gen-admin-title {
5132 5133 font-size: 18px;
5133 5134 color: inherit;
5134 5135 }
5135   -.general-who-title {margin-top: 49px}
5136 5136 \ No newline at end of file
  5137 +.general-who-title {margin-top: 49px}
  5138 +.admin-who-check {
  5139 + height: 21px;
  5140 + width: 100%;
  5141 + float: left;
  5142 + margin-top: 4px;
  5143 +}
  5144 +.admin-who-check input.custom-radio + label span{
  5145 + margin-top: 5px;
  5146 +}
... ...