Administrator / test_3

Commit 44baee6aead544c97b152a11d45dc66956559200

Authored by Administrator
2 parents d772a604 6fc9a376

Merge remote-tracking branch 'origin/master' 

Conflicts:
	frontend/views/accounts/participant-edit.php
Showing 15 changed files with 486 additions and 325 deletions   Show diff stats
Inline Side-by-side
frontend/assets/AppAsset.php
  Show/Hide comments   View file @44baee6
... ... @@ -19,7 +19,7 @@ class AppAsset extends AssetBundle
19 19 public $css = [
20 20 '/css/style.css',
21 21 '/admin/css/flags32.css',
22   - //'https://fonts.googleapis.com/css?family=Roboto:400,700&subset=cyrillic,latin',
  22 + 'https://fonts.googleapis.com/css?family=Roboto:400,700&subset=cyrillic,latin',
23 23 '/css/owl.carousel.css'
24 24 ];
25 25 public $js = [
... ...
frontend/views/accounts/_job_form.php
  Show/Hide comments   View file @44baee6
... ... @@ -22,7 +22,7 @@
22 22 ->textInput([ 'class' => 'custom-input-2' ]); ?>
23 23 </div>
24 24 </div>
25   - <div class="input-blocks-wrapper">
  25 + <div class="input-blocks-wrapper hint-link">
26 26 <div class="input-blocks">
27 27 <?= $form->field($model, '[' . $index . ']link')
28 28 ->label('Ссылка на компанию на сайте МФП')
... ...
frontend/views/accounts/_projects_form.php
  Show/Hide comments   View file @44baee6
1 1 <?php
2   - /**
3   - * @var Project $project
4   - * @var Specialization[] $specialization
5   - * @var Payment[] $payment
6   - * @var string[] $projects
7   - */
8   - use common\components\Request;
9   - use common\models\Currency;
10   - use common\models\File;
11   - use common\models\Payment;
12   - use common\models\Project;
13   - use common\models\Specialization;
14   - use common\modules\file\widgets\ImageUploader;
15   - use common\modules\fileloader\widgets\FileloaderWidget;
16   - use kartik\select2\Select2;
17   - use mihaildev\ckeditor\CKEditor;
18   - use yii\helpers\Html;
19   - use yii\jui\DatePicker;
20   - use yii\web\JsExpression;
21   - use yii\widgets\ActiveForm;
22   -
23   - $this->title = 'Проекты';
24   - $this->params[ 'breadcrumbs' ][] = $this->title;
  2 +/**
  3 + * @var Project $project
  4 + * @var Specialization[] $specialization
  5 + * @var Payment[] $payment
  6 + * @var string[] $projects
  7 + */
  8 +use common\components\Request;
  9 +use common\models\Currency;
  10 +use common\models\File;
  11 +use common\models\Payment;
  12 +use common\models\Project;
  13 +use common\models\Specialization;
  14 +use common\modules\file\widgets\ImageUploader;
  15 +use common\modules\fileloader\widgets\FileloaderWidget;
  16 +use kartik\select2\Select2;
  17 +use mihaildev\ckeditor\CKEditor;
  18 +use yii\helpers\Html;
  19 +use yii\jui\DatePicker;
  20 +use yii\web\JsExpression;
  21 +use yii\widgets\ActiveForm;
  22 +
  23 +$this->title = 'Проекты';
  24 +$this->params[ 'breadcrumbs' ][] = $this->title;
25 25 ?>
26 26 <div class="login-left-column-title"><?= $this->title ?></div>
27 27  
28 28 <?php
29   - $form = ActiveForm::begin([ 'options' => [ 'enctype' => 'multipart/form-data' ] ]);
  29 +$form = ActiveForm::begin([ 'options' => [ 'enctype' => 'multipart/form-data' ] ]);
30 30 ?>
31 31  
32 32  
33 33 <div class="input-blocks-wrapper">
34 34 <div class="input-blocks">
35 35 <?= $form->field($project, 'name')
36   - ->textInput([ 'class' => 'custom-input-2' ]) ?>
  36 + ->textInput([ 'class' => 'custom-input-2' ]) ?>
37 37 </div>
38 38 </div>
39 39  
40 40 <div class="input-blocks-wrapper">
41 41 <div class="input-blocks admin-project-list admin-currency-second">
42 42 <?= $form->field($project, 'project_pid')
43   - ->dropDownList($projects, [ 'prompt' => 'Родительский проект' ]) ?>
  43 + ->dropDownList($projects, [ 'prompt' => 'Родительский проект' ]) ?>
44 44 </div>
45 45 </div>
46 46  
... ... @@ -68,13 +68,13 @@
68 68 <?= $form->field($project, "specializationInput[{$child_second->specialization_id}]", [
69 69 'template' => '{input}{label}{hint}{error}',
70 70 ])
71   - ->label('<span></span>' . $child_second->specialization_name)
72   - ->checkbox([
73   - 'value' => $child_second->specialization_id,
74   - 'label' => NULL,
75   - 'uncheck' => NULL,
76   - 'class' => 'custom-check',
77   - ], false) ?>
  71 + ->label('<span></span>' . $child_second->specialization_name)
  72 + ->checkbox([
  73 + 'value' => $child_second->specialization_id,
  74 + 'label' => NULL,
  75 + 'uncheck' => NULL,
  76 + 'class' => 'custom-check',
  77 + ], false) ?>
78 78 </a>
79 79 </li>
80 80 <?php endif; ?>
... ... @@ -104,33 +104,33 @@
104 104 <div class="input-blocks-wrapper">
105 105 <div class="input-blocks">
106 106 <?= $form->field($project, 'city')
107   - ->widget(Select2::classname(), [
108   - 'options' => [ 'placeholder' => 'Выбор города ...' ],
109   - 'pluginOptions' => [
110   - 'allowClear' => true,
111   - 'minimumInputLength' => 3,
112   - 'ajax' => [
113   - 'url' => \yii\helpers\Url::to([ 'site/city' ]),
114   - 'dataType' => 'json',
115   - 'data' => new JsExpression('function(params) { return {q:params.term}; }'),
116   - ],
117   - 'escapeMarkup' => new JsExpression('function (markup) { return markup; }'),
118   - 'templateResult' => new JsExpression('function(city) { return city.text; }'),
119   - 'templateSelection' => new JsExpression('function (city) { return city.text; }'),
120   - ],
121   - ]); ?>
  107 + ->widget(Select2::classname(), [
  108 + 'options' => [ 'placeholder' => 'Выбор города ...' ],
  109 + 'pluginOptions' => [
  110 + 'allowClear' => true,
  111 + 'minimumInputLength' => 3,
  112 + 'ajax' => [
  113 + 'url' => \yii\helpers\Url::to([ 'site/city' ]),
  114 + 'dataType' => 'json',
  115 + 'data' => new JsExpression('function(params) { return {q:params.term}; }'),
  116 + ],
  117 + 'escapeMarkup' => new JsExpression('function (markup) { return markup; }'),
  118 + 'templateResult' => new JsExpression('function(city) { return city.text; }'),
  119 + 'templateSelection' => new JsExpression('function (city) { return city.text; }'),
  120 + ],
  121 + ]); ?>
122 122 </div>
123 123  
124 124  
125 125 <div class="input-blocks street-input">
126 126 <?= $form->field($project, 'street', [ 'template' => "{label}{input}{hint}{error}" ])
127   - ->textInput([ 'class' => 'custom-input-2' ]) ?>
  127 + ->textInput([ 'class' => 'custom-input-2' ]) ?>
128 128 </div>
129 129  
130 130  
131 131 <div class="input-blocks home-input">
132 132 <?= $form->field($project, 'house', [ 'template' => "{label}{input}{hint}{error}" ])
133   - ->textInput([ 'class' => 'custom-input-2' ]) ?>
  133 + ->textInput([ 'class' => 'custom-input-2' ]) ?>
134 134 </div>
135 135 </div>
136 136 </div>
... ... @@ -140,20 +140,20 @@
140 140 <?= $form->field($project, 'budget', [
141 141 'template' => "{label}<br />{input}\n{hint}\n{error}",
142 142 ])
143   - ->textInput([
144   - 'class' => 'custom-input-2 custom-input-2-date',
145   - 'type' => 'number',
146   - ]) ?>
  143 + ->textInput([
  144 + 'class' => 'custom-input-2 custom-input-2-date',
  145 + 'type' => 'number',
  146 + ]) ?>
147 147 </div>
148 148 <div class="input-blocks admin-project-list-two admin-currency-second">
149 149 <?= $form->field($project, 'budget_currency')
150   - ->label(false)
151   - ->dropDownList(Currency::getCurrencyDropdown(), [ 'class' => 'custom-input-2' ]); ?>
  150 + ->label(false)
  151 + ->dropDownList(Currency::getCurrencyDropdown(), [ 'class' => 'custom-input-2' ]); ?>
152 152 </div>
153 153 <div class="input-blocks admin-who-check-payment admin-project-contractual">
154 154 <?= $form->field($project, 'contractual', [ 'template' => "{input}{label}\n{hint}\n{error}" ])
155   - ->checkbox([ 'class' => 'custom-check' ], false)
156   - ->label('<span></span>Договорной') ?>
  155 + ->checkbox([ 'class' => 'custom-check' ], false)
  156 + ->label('<span></span>Договорной') ?>
157 157 </div>
158 158  
159 159 </div>
... ... @@ -161,37 +161,37 @@
161 161 <div class="input-blocks-wrapper">
162 162 <div class="input-blocks">
163 163 <?= $form->field($project, 'payment_variant')
164   - ->radioList([
165   - 1 => 'Без предоплаты',
166   - 2 => 'Предоплата возможна',
167   - ], [
168   - 'item' => function($index, $label, $name, $checked, $value) {
169   - $return = '<div class="admin-who-check">';
170   - $return .= '<input class="custom-radio" id="select_admin_mfp' . $value . '" type="radio" name="' . $name . '" value="' . $value . '" ' . ( $checked ? "checked" : "" ) . ' >';
171   - $return .= '<label for="select_admin_mfp' . $value . '" >';
172   - $return .= '<span></span>' . ucwords($label);
173   - $return .= '</label>';
174   - $return .= '</div>';
175   - return $return;
176   - },
177   - ]) ?>
  164 + ->radioList([
  165 + 1 => 'Без предоплаты',
  166 + 2 => 'Предоплата возможна',
  167 + ], [
  168 + 'item' => function($index, $label, $name, $checked, $value) {
  169 + $return = '<div class="admin-who-check">';
  170 + $return .= '<input class="custom-radio" id="select_admin_mfp' . $value . '" type="radio" name="' . $name . '" value="' . $value . '" ' . ( $checked ? "checked" : "" ) . ' >';
  171 + $return .= '<label for="select_admin_mfp' . $value . '" >';
  172 + $return .= '<span></span>' . ucwords($label);
  173 + $return .= '</label>';
  174 + $return .= '</div>';
  175 + return $return;
  176 + },
  177 + ]) ?>
178 178 </div>
179 179 </div>
180 180  
181 181 <div class="input-blocks-wrapper">
182 182 <div class="input-blocks">
183 183 <?= $form->field($project, 'paymentInput')
184   - ->checkboxList($payment, [
185   - 'item' => function($index, $label, $name, $checked, $value) {
186   - $return = '<div class="admin-who-check-payment">';
187   - $return .= '<input class="custom-check" id="check_admin_mfp' . $value . '" type="checkbox" name="' . $name . '" value="' . $value . '" ' . ( $checked ? "checked" : "" ) . ' >';
188   - $return .= '<label for="check_admin_mfp' . $value . '" >';
189   - $return .= '<span></span>' . ucwords($label);
190   - $return .= '</label>';
191   - $return .= '</div>';
192   - return $return;
193   - },
194   - ]) ?>
  184 + ->checkboxList($payment, [
  185 + 'item' => function($index, $label, $name, $checked, $value) {
  186 + $return = '<div class="admin-who-check-payment">';
  187 + $return .= '<input class="custom-check" id="check_admin_mfp' . $value . '" type="checkbox" name="' . $name . '" value="' . $value . '" ' . ( $checked ? "checked" : "" ) . ' >';
  188 + $return .= '<label for="check_admin_mfp' . $value . '" >';
  189 + $return .= '<span></span>' . ucwords($label);
  190 + $return .= '</label>';
  191 + $return .= '</div>';
  192 + return $return;
  193 + },
  194 + ]) ?>
195 195 </div>
196 196 </div>
197 197  
... ... @@ -199,70 +199,71 @@
199 199 <div class="input-blocks-wrapper">
200 200 <div class="input-blocks admin-project-days">
201 201 <?= $form->field($project, 'deadline', [ 'template' => "{label}<br />{input}<span class='admn-input-txt' style='padding-left: 10px'>дней</span>\n{hint}\n{error}" ])
202   - ->textInput([
203   - 'class' => 'custom-input-2 custom-input-2-date',
204   - 'type' => 'number',
205   - ]) ?>
  202 + ->textInput([
  203 + 'class' => 'custom-input-2 custom-input-2-date',
  204 + 'type' => 'number',
  205 + ]) ?>
206 206 </div>
207 207 </div>
208 208  
209 209 <div class="input-blocks-wrapper full-blocks admin-editor-bl">
210 210 <div class="input-blocks">
211 211 <?= $form->field($project, 'description')
212   - ->widget(CKEditor::className()) ?>
  212 + ->widget(CKEditor::className()) ?>
213 213 </div>
214 214 </div>
215 215  
216 216 <?php
217   - /* == Old file upload ==
218   - ?>
219   - <div class="input-blocks-wrapper admin-project-file">
220   - <div class="input-blocks">
221   - <div style="position: absolute; float: left;top: 0; left: 0; z-index: 1; width: 100%; overflow: hidden">
222   - <div class="gen-admin-title">Присоединить файл</div>
223   - <div class="admin-project-file-btn">Загрузить</div>
224   - <div class="not-file-mb-adm">До 3 Мб файл</div>
225   - </div>
226   - <div style="opacity: 0; height: 54px; width: 100%; float: left;position: absolute; top: 0;left: 0; z-index: 2;-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=0)'">
227   - <?= $form->field($project, 'files[]')
228   - ->fileInput([ 'multiple' => 'multiple' ]) ?>
229   - </div>
  217 +/* == Old file upload ==
  218 +?>
  219 +<div class="input-blocks-wrapper admin-project-file">
  220 + <div class="input-blocks">
  221 + <div style="position: absolute; float: left;top: 0; left: 0; z-index: 1; width: 100%; overflow: hidden">
  222 + <div class="gen-admin-title">Присоединить файл</div>
  223 + <div class="admin-project-file-btn">Загрузить</div>
  224 + <div class="not-file-mb-adm">До 3 Мб файл</div>
  225 + </div>
  226 + <div style="opacity: 0; height: 54px; width: 100%; float: left;position: absolute; top: 0;left: 0; z-index: 2;-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=0)'">
  227 + <?= $form->field($project, 'files[]')
  228 + ->fileInput([ 'multiple' => 'multiple' ]) ?>
230 229 </div>
231 230 </div>
232   - <?php
233   - == End of old file upload == */
  231 +</div>
  232 +<?php
  233 + == End of old file upload == */
234 234 ?>
235 235  
236 236 <div class="input-blocks-wrapper">
237 237 <?php
238   - echo $form->field($project, 'fileloader')
239   - ->label(false)
240   - ->widget(FileloaderWidget::className(), [
241   - 'labelOptions' => [ 'label' => '<div class="gen-admin-title">Присоединить файлы</div><div class="admin-project-file-btn">Загрузить</div><div class="not-file-mb-adm">До 3 Мб файл</div>' ],
242   - 'inputOptions' => [
243   - 'multiple' => 'multiple',
244   - 'class' => 'hidden',
245   - ],
246   - 'options' => [ 'class' => 'fileloader-file' ],
247   - ]);
  238 + echo $form->field($project, 'fileloader')
  239 + ->label(false)
  240 + ->widget(FileloaderWidget::className(), [
  241 + 'labelOptions' => [ 'label' => '<div class="gen-admin-title">Присоединить файлы</div><div class="admin-project-file-btn">Загрузить</div><div class="not-file-mb-adm">До 3 Мб файл</div>' ],
  242 + 'inputOptions' => [
  243 + 'multiple' => 'multiple',
  244 + 'class' => 'hidden',
  245 + ],
  246 + 'options' => [ 'class' => 'fileloader-file' ],
  247 + ]);
248 248 ?>
249 249 </div>
250 250  
251 251 <div class="input-blocks-wrapper">
252 252 <div class="input-blocks admin-project-list admin-currency-second">
253 253 <?= $form->field($project, 'date_end')
254   - ->widget(DatePicker::className(), [
255   - 'dateFormat' => 'yyyy-MM-dd',
256   - 'clientOptions' => [ 'minDate' => 1 ],
257   - ]) ?>
  254 + ->widget(DatePicker::className(), [
  255 + 'dateFormat' => 'yyyy-MM-dd',
  256 + 'clientOptions' => [ 'minDate' => 1 ],
  257 + ]) ?>
258 258 </div>
259 259 </div>
260 260  
261   -<div class="input-blocks-wrapper">
  261 +<div class="input-blocks-wrapper hint-link hint-link-check">
262 262 <div class="input-blocks admin-project-list admin-currency-second">
263   - <?= $form->field($project, 'hidden')
264   - ->checkbox()
265   - ->hint('Проект, снятый с тендера, будет добавлен в Архив (не доступен в поиске, но доступен по ссылке)') ?>
  263 + <?= $form->field($project, 'hidden', [ 'template' => "{input}{label}\n{hint}\n{error}" ])
  264 + ->checkbox([ 'class' => 'custom-check admin-check' ], false)
  265 + ->label('<span></span>Снять с тендера')
  266 + ->hint('Проект, снятый с тендера, будет добавлен в Архив (не доступен в поиске, но доступен по ссылке)') ?>
266 267 </div>
267 268 </div>
268 269  
... ... @@ -271,18 +272,18 @@
271 272 <?= Html::submitButton($project->isNewRecord ? Yii::t('app', 'add') : 'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?>
272 273 <div class="admin-remove-note">
273 274 <?php
274   - if(!$project->isNewRecord) {
275   - echo Html::a(Yii::t('app', 'delete'), [
276   - 'accounts/projects-delete',
277   - 'id' => $project->project_id,
278   - ], [
279   - 'title' => Yii::t('app', 'delete'),
280   - 'aria-label' => Yii::t('app', 'delete'),
281   - 'data-confirm' => Yii::t('app', 'delete_confirm'),
282   - 'data-method' => 'post',
283   - 'data-pjax' => 0,
284   - ]);
285   - }
  275 + if(!$project->isNewRecord) {
  276 + echo Html::a(Yii::t('app', 'delete'), [
  277 + 'accounts/projects-delete',
  278 + 'id' => $project->project_id,
  279 + ], [
  280 + 'title' => Yii::t('app', 'delete'),
  281 + 'aria-label' => Yii::t('app', 'delete'),
  282 + 'data-confirm' => Yii::t('app', 'delete_confirm'),
  283 + 'data-method' => 'post',
  284 + 'data-pjax' => 0,
  285 + ]);
  286 + }
286 287 ?>
287 288 </div>
288 289 <div class="admin-back-note">
... ... @@ -292,7 +293,7 @@
292 293 </div>
293 294  
294 295 <?php
295   - $form->end();
  296 +$form->end();
296 297 ?>
297 298 <script>
298 299 $(document).ready(
... ... @@ -308,7 +309,7 @@
308 309 if($('.admin-project-contractual input[type="checkbox"]').prop("checked"))
309 310 {
310 311 $('.admin-project-list-two input, .admin-project-list-two select')
311   - .attr('disabled', 'disabled')
  312 + .attr('disabled', 'disabled')
312 313 }
313 314 $('.admin-project-contractual input[type="checkbox"]').change(
314 315 function()
... ... @@ -316,11 +317,11 @@
316 317 if($(this).prop("checked"))
317 318 {
318 319 $('.admin-project-list-two input, .admin-project-list-two select')
319   - .attr('disabled', 'disabled')
  320 + .attr('disabled', 'disabled')
320 321 } else
321 322 {
322 323 $('.admin-project-list-two input, .admin-project-list-two select')
323   - .removeAttr('disabled')
  324 + .removeAttr('disabled')
324 325 }
325 326 }
326 327 )
... ... @@ -334,6 +335,10 @@
334 335 }
335 336 );
336 337  
  338 + $('#project-date_end').focus(function () {
  339 + $('#ui-datepicker-div').addClass('fix-color-datepicker')
  340 + })
337 341 }
338 342 )
339 343 </script>
  344 +
... ...
frontend/views/accounts/_vacancy_form.php
  Show/Hide comments   View file @44baee6
... ... @@ -66,7 +66,7 @@
66 66 </div>
67 67 </div>
68 68  
69   -<div class="input-blocks-wrapper">
  69 +<div class="input-blocks-wrapper hint-link hint-link-fx">
70 70 <div class="input-blocks">
71 71 <?= $form->field($vacancy, 'city')
72 72 ->hint('Город, в котором предлагается работа', ['tag' => 'span'])
... ...
frontend/views/accounts/employment.php
  Show/Hide comments   View file @44baee6
... ... @@ -28,7 +28,7 @@
28 28 </div>
29 29 </div>
30 30  
31   - <div class="input-blocks-wrapper">
  31 + <div class="input-blocks-wrapper hint-link">
32 32 <div class="input-blocks">
33 33 <?= $form->field($current, '[0]link')
34 34 ->label('Ссылка на компанию на сайте МФП')
... ... @@ -113,7 +113,7 @@
113 113 </div>
114 114 </div>
115 115  
116   - <div class="input-blocks-wrapper">
  116 + <div class="input-blocks-wrapper hint-link">
117 117 <div class="input-blocks">
118 118 <?= $form->field($job_model, '[' . ( $index + 1 ) . ']link')
119 119 ->label('Ссылка на компанию на сайте МФП')
... ...
frontend/views/accounts/general.php
  Show/Hide comments   View file @44baee6
... ... @@ -33,20 +33,18 @@
33 33 ], false); ?>
34 34 </div>
35 35 <div class="general-check-right">
36   - <div class="general-check-right-txt general-check-right-txt-fix">Обязательно должны быть указаны специализации услуг, что бы вы попали в рейтинг исполнителей</div>
  36 + <div class="general-check-right-txt">
  37 + Обязательно должны быть указаны специализации услуг, что бы вы попали в рейтинг исполнителей
  38 + <?php
  39 + if(!empty($user->specializations)) {
  40 + echo "<p>В Вашем профиле указаны специализации: ".count($user->specializations)."</p>";
  41 + } else {
  42 + echo "<p>В Вашем профиле не указаны специализации. Чтобы указать - перейдите по ".Html::a('ссылке', ['accounts/service'], ['target' => '_blank'])."</p>";
  43 + }
  44 + ?>
  45 + </div>
37 46 </div>
38 47 </div>
39   - <div>
40   - <p>
41   - <?php
42   - if(!empty($user->specializations)) {
43   - echo "<p>В Вашем профиле указаны специализации: ".count($user->specializations)."</p>";
44   - } else {
45   - echo "<p>В Вашем профиле не указаны специализации. Чтобы указать - перейдите по ".Html::a('ссылке', ['accounts/service'], ['target' => '_blank'])."</p>";
46   - }
47   - ?>
48   - </p>
49   - </div>
50 48 <div class="general-check">
51 49 <div class="general-check-left">
52 50 <?= $form->field($user_info, 'is_customer', [ 'template' => "{input}\n{label}\n{error}" ])
... ... @@ -56,19 +54,17 @@
56 54 ], false); ?>
57 55 </div>
58 56 <div class="general-check-right">
59   - <div class="general-check-right-txt general-check-right-txt-fix">Обязательно должны быть созданы проекты вами, что бы вы попали в рейтинг заказчиков</div>
60   - </div>
61   - </div>
62   - <div>
63   - <p>
64   - <?php
  57 + <div class="general-check-right-txt">
  58 + Обязательно должны быть созданы проекты вами, что бы вы попали в рейтинг заказчиков
  59 + <?php
65 60 if(!empty($user->projects)) {
66 61 echo "<p>В Вашем профиле добавлены проекты: ".count($user->projects)."</p>";
67 62 } else {
68 63 echo "<p>В Вашем профиле не добавлены проекты. Чтобы добавить - перейдите по ".Html::a('ссылке', ['accounts/projects'], ['target' => '_blank'])."</p>";
69 64 }
70   - ?>
71   - </p>
  65 + ?>
  66 + </div>
  67 + </div>
72 68 </div>
73 69 </div>
74 70 <div class="general-who style border-general">
... ...
frontend/views/accounts/participant-edit.php
  Show/Hide comments   View file @44baee6
... ... @@ -14,53 +14,129 @@
14 14 $this->params[ 'breadcrumbs' ][] = $this->title;
15 15 ?>
16 16 <div class="login-left-column-title"><?= $this->title ?></div>
17   -<div>
18   - <p>Редактировать информацию о себе:</p>
  17 +<div class="login-left-column-title-two style">Редактировать информацию о себе:</div>
  18 + <?php
  19 + if($model->status != 1) {
  20 + ?>
  21 + <div class="attention_bl style" role="alert">
  22 + <strong>Внимание:</strong> данным действием Вы подтверждаете свое участие в проекте.
  23 + </div>
  24 + <?php
  25 + }
  26 + ?>
  27 +
  28 + <?php
  29 + $form = ActiveForm::begin();
  30 + ?>
  31 + <div class="input-blocks-wrapper">
  32 + <div class="input-blocks">
  33 + <?= $form->field($model, 'position')
  34 + ->textInput([ 'class' => 'custom-input-2' ]);
  35 + ?>
  36 + </div>
  37 + </div>
  38 +
  39 + <div class="input-blocks-wrapper">
  40 + <div class="input-blocks">
  41 + <?=
  42 + $form->field($model, 'time')
  43 + ->textInput([
  44 + 'class' => 'custom-input-2',
  45 + 'type' => 'number',
  46 + 'min' => 0,
  47 + ])
  48 + ?>
  49 + </div>
  50 + </div>
  51 +
  52 +
  53 + <div class="login-left-column-title-two style">Добавить фотографию в личный альбом данного проекта:</div>
  54 + <div class="input-blocks-wrapper full-blocks admin-editor-bl">
  55 + <div class="input-blocks">
  56 + <?php
  57 + if($model->status == 1 && !empty( $model->gallery )) {
  58 + echo $form->field($model->portfolioGallery, 'caption')
  59 + ->widget(CKEditor::className(), [ 'editorOptions' => [ 'preset' => 'basic' ] ]);
  60 + echo Html::tag('div', ImageUploader::widget([
  61 + 'model' => $model->gallery,
  62 + 'field' => 'photo',
  63 + 'size' => [
  64 + [
  65 + 'width' => 152,
  66 + 'height' => 108,
  67 + ],
  68 + ],
  69 + 'multi' => true,
  70 + 'gallery' => $model->gallery->photo,
  71 + 'name' => 'Загрузить фото галереи',
  72 + ]), [ 'class' => 'admin-gallery-photos-load-wr style' ]);
  73 + } else {
  74 + echo Html::tag('p', 'Для добавления фотографий Вы должны подтвердить свое участие');
  75 + }
  76 + ?>
  77 + </div>
  78 + </div>
  79 +
  80 + <div class="admin-save-btn skills-save-btn admin-add-remove-wr style">
  81 + <div class="admin-back-note">
  82 + <?= Html::a('Вернуться', [ 'accounts/participant' ]); ?>
  83 + </div>
  84 +
  85 + <?= Html::submitButton('Обновить'); ?>
  86 + <?php
  87 + $form->end();
  88 + ?>
  89 + </div>
  90 +
  91 +
  92 +
  93 +<!--<div>-->
  94 +<!-- <p>Редактировать информацию о себе:</p>-->
19 95 <!-- --><?php
20 96 // if($model->status != 1) {
21 97 // ?>
22   - <div class="alert alert-info" role="alert">
23   - <strong>Внимание:</strong> данным действием Вы подтверждаете свое участие в проекте.
24   - </div>
  98 +<!-- <div class="alert alert-info" role="alert">-->
  99 +<!-- <strong>Внимание:</strong> данным действием Вы подтверждаете свое участие в проекте.-->
  100 +<!-- </div>-->
25 101 <!-- --><?php
26 102 // }
27 103 // ?>
28   - <div>
29   - <?php
30   - $form = ActiveForm::begin();
31   - echo $form->field($model, 'position')
32   - ->textInput();
33   - echo $form->field($model, 'time')
34   - ->input('number');
35   - ?>
36   - </div>
37   - <p>Добавить фотографию в личный альбом данного проекта:</p>
38   - <?php
39   - if($model->status == 1 && !empty( $model->gallery )) {
40   - echo $form->field($model->portfolioGallery, 'caption')
41   - ->widget(CKEditor::className(), [ 'editorOptions' => [ 'preset' => 'basic' ] ]);
42   - echo Html::tag('div', ImageUploader::widget([
43   - 'model' => $model->gallery,
44   - 'field' => 'photo',
45   - 'size' => [
46   - [
47   - 'width' => 152,
48   - 'height' => 108,
49   - ],
50   - ],
51   - 'multi' => true,
52   - 'gallery' => $model->gallery->photo,
53   - 'name' => 'Загрузить фото галереи',
54   - ]), [ 'class' => 'admin-gallery-photos-load-wr style' ]);
55   - } else {
56   - echo Html::tag('p', 'Для добавления фотографий Вы должны подтвердить свое участие');
57   - }
58   - ?>
59   - <p class="text-right">
60   - <?php
61   - echo Html::a('Вернуться', [ 'accounts/participant' ]);
62   - echo Html::submitButton('Обновить');
63   - $form->end();
64   - ?>
65   - </p>
66   -</div>
67 104 \ No newline at end of file
  105 +<!-- <div>-->
  106 +<!-- --><?php
  107 +// $form = ActiveForm::begin();
  108 +// echo $form->field($model, 'position')
  109 +// ->textInput();
  110 +// echo $form->field($model, 'time')
  111 +// ->input('number');
  112 +// ?>
  113 +<!-- </div>-->
  114 +<!-- <p>Добавить фотографию в личный альбом данного проекта:</p>-->
  115 +<!-- --><?php
  116 +// if($model->status == 1 && !empty( $model->gallery )) {
  117 +// echo $form->field($model->portfolioGallery, 'caption')
  118 +// ->widget(CKEditor::className(), [ 'editorOptions' => [ 'preset' => 'basic' ] ]);
  119 +// echo Html::tag('div', ImageUploader::widget([
  120 +// 'model' => $model->gallery,
  121 +// 'field' => 'photo',
  122 +// 'size' => [
  123 +// [
  124 +// 'width' => 152,
  125 +// 'height' => 108,
  126 +// ],
  127 +// ],
  128 +// 'multi' => true,
  129 +// 'gallery' => $model->gallery->photo,
  130 +// 'name' => 'Загрузить фото галереи',
  131 +// ]), [ 'class' => 'admin-gallery-photos-load-wr style' ]);
  132 +// } else {
  133 +// echo Html::tag('p', 'Для добавления фотографий Вы должны подтвердить свое участие');
  134 +// }
  135 +// ?>
  136 +<!-- <p class="text-right">-->
  137 +<!-- --><?php
  138 +// echo Html::a('Вернуться', [ 'accounts/participant' ]);
  139 +// echo Html::submitButton('Обновить');
  140 +// $form->end();
  141 +// ?>
  142 +<!-- </p>-->
  143 +<!--</div>-->
68 144 \ No newline at end of file
... ...
frontend/views/accounts/participant.php
  Show/Hide comments   View file @44baee6
... ... @@ -16,7 +16,7 @@
16 16 $this->title = 'Портфолио участник';
17 17 $this->params[ 'breadcrumbs' ][] = $this->title;
18 18 ?>
19   -<div class="login-left-column-title"><?= $this->title ?></div>
  19 +<div class="login-left-column-title fix"><?= $this->title ?></div>
20 20 <div class="admin-table-portfolio">
21 21 <?= GridView::widget([
22 22 'options' => [ 'class' => 'style admin-all-pages-wr' ],
... ...
frontend/views/accounts/projects.php
  Show/Hide comments   View file @44baee6
... ... @@ -19,109 +19,112 @@
19 19 <div class="admin-all-pages-add">
20 20 <?= Html::a(Yii::t('app', 'add'), [ 'projects-create' ], [ 'class' => 'btn btn-success' ]) ?>
21 21 </div>
22   -<?= GridView::widget([
23   - 'options' => ['class'=>'style admin-all-pages-wr'],
24   - 'dataProvider' => $dataProvider,
25   - 'filterModel' => $searchModel,
26   - 'columns' => [
27   - [
28   - 'attribute' => 'project_id',
29   - 'label' => 'ID',
30   - ],
31   - 'name',
32   - [
33   - 'attribute' => 'date_add',
34   - 'filter' => "<div class=\"input-group input-group-xs input-daterange\">
  22 +<div class="admin-table-portfolio">
  23 + <?= GridView::widget([
  24 + 'options' => ['class'=>'style admin-all-pages-wr'],
  25 + 'dataProvider' => $dataProvider,
  26 + 'filterModel' => $searchModel,
  27 + 'columns' => [
  28 + [
  29 + 'attribute' => 'project_id',
  30 + 'label' => 'ID',
  31 + ],
  32 + 'name',
  33 + [
  34 + 'attribute' => 'date_add',
  35 + 'filter' => "<div class=\"input-group input-group-xs input-daterange\">
35 36 <span class='field-teamsearch-experience_from_from'>".
36   - DatePicker::widget([
37   - 'model' => $searchModel,
38   - 'attribute' => 'date_add_from',
39   - 'language' => 'ru',
40   - 'dateFormat' => 'yyyy-MM-dd',
41   - 'clientOptions' => [
42   - 'changeYear' => true,
43   - 'changeMonth' => true,
44   - ],
45   - ]).
46   - "</span>
  37 + DatePicker::widget([
  38 + 'model' => $searchModel,
  39 + 'attribute' => 'date_add_from',
  40 + 'language' => 'ru',
  41 + 'dateFormat' => 'yyyy-MM-dd',
  42 + 'clientOptions' => [
  43 + 'changeYear' => true,
  44 + 'changeMonth' => true,
  45 + ],
  46 + ]).
  47 + "</span>
47 48 <span class=\"input-group-addon kv-field-separator\">
48 49 <i class=\"glyphicon glyphicon-resize-horizontal\"></i>
49 50 </span>
50 51 <span class='field-teamsearch-experience_from_to'>".
51   - DatePicker::widget([
52   - 'model' => $searchModel,
53   - 'attribute' => 'date_add_to',
54   - 'language' => 'ru',
55   - 'dateFormat' => 'yyyy-MM-dd',
56   - 'clientOptions' => [
57   - 'changeYear' => true,
58   - 'changeMonth' => true,
59   - ],
60   - ])
61   - ."</span>
  52 + DatePicker::widget([
  53 + 'model' => $searchModel,
  54 + 'attribute' => 'date_add_to',
  55 + 'language' => 'ru',
  56 + 'dateFormat' => 'yyyy-MM-dd',
  57 + 'clientOptions' => [
  58 + 'changeYear' => true,
  59 + 'changeMonth' => true,
  60 + ],
  61 + ])
  62 + ."</span>
62 63 </div>",
63   - 'format' => 'html',
64   - ],
65   - [
66   - 'attribute' => 'budget',
67   - 'filter' => Html::activeInput('text', $searchModel, 'budget_approx'),
68   - 'value' => function($model, $key, $index, $column) {
69   - /**
70   - * @var Project $model
71   - */
72   - if($model->contractual) {
73   - return 'Договорной';
74   - } elseif(empty($model->budget)) {
75   - return 'Не задано';
76   - } else {
77   - return $model->budget;
78   - }
79   - },
80   - 'label' => $searchModel->getAttributeLabel('budget').' +/- 10%',
81   - ],
82   - [
83   - 'attribute' => 'contractual',
84   - 'filter' => Html::activeDropDownList($searchModel, 'contractual', [1 => 'Только договорные', 2 => 'Без договорных'], ['prompt' => 'Все']),
85   - 'value' => function($model) {
86   - return \Yii::$app->formatter->asBoolean($model->contractual);
87   - }
88   - ],
89   - 'city',
90   - [
91   - 'attribute' => 'specializationString',
92   - ],
93   - 'view_count',
94   - [
95   - 'value' => function($model, $key, $index, $column) {
96   - return count($model->comments);
97   - },
98   - 'label' => 'Отклики',
99   - ],
100   - [
101   - 'class' => ActionColumn::className(),
102   - 'buttons' => [
103   - 'update' => function($url, $model, $key) {
104   - return Html::a('<img src="/images/ico_pencil.png" alt="">', [
105   - 'projects-update',
106   - 'id' => $model->project_id,
107   - ],[
108   - 'title' => 'Редактировать',
109   - ]);
  64 + 'format' => 'html',
  65 + ],
  66 + [
  67 + 'attribute' => 'budget',
  68 + 'filter' => Html::activeInput('text', $searchModel, 'budget_approx', ['class'=>'form-control']),
  69 + 'value' => function($model, $key, $index, $column) {
  70 + /**
  71 + * @var Project $model
  72 + */
  73 + if($model->contractual) {
  74 + return 'Договорной';
  75 + } elseif(empty($model->budget)) {
  76 + return 'Не задано';
  77 + } else {
  78 + return $model->budget;
  79 + }
110 80 },
111   - 'delete' => function($url, $model, $key) {
112   - return Html::a('<img src="/images/delete-ico.png" alt="">', [
113   - 'projects-delete',
114   - 'id' => $model->project_id,
115   - ], [
116   - 'title' => Yii::t('app', 'delete'),
117   - 'aria-label' => Yii::t('app', 'delete'),
118   - 'data-confirm' => Yii::t('app', 'delete_confirm'),
119   - 'data-method' => 'post',
120   - 'data-pjax' => '0',
121   - ]);
  81 + 'label' => $searchModel->getAttributeLabel('budget').' +/- 10%',
  82 + ],
  83 + [
  84 + 'attribute' => 'contractual',
  85 + 'filter' => Html::activeDropDownList($searchModel, 'contractual',[1 => 'Только договорные', 2 => 'Без договорных'], ['prompt' => 'Все', 'class'=>'form-control']),
  86 + 'value' => function($model) {
  87 + return \Yii::$app->formatter->asBoolean($model->contractual);
  88 + }
  89 + ],
  90 + 'city',
  91 + [
  92 + 'attribute' => 'specializationString',
  93 + ],
  94 + 'view_count',
  95 + [
  96 + 'value' => function($model, $key, $index, $column) {
  97 + return count($model->comments);
122 98 },
  99 + 'label' => 'Отклики',
  100 + ],
  101 + [
  102 + 'class' => ActionColumn::className(),
  103 + 'buttons' => [
  104 + 'update' => function($url, $model, $key) {
  105 + return Html::a('<img src="/images/ico_pencil.png" alt="">', [
  106 + 'projects-update',
  107 + 'id' => $model->project_id,
  108 + ],[
  109 + 'title' => 'Редактировать',
  110 + ]);
  111 + },
  112 + 'delete' => function($url, $model, $key) {
  113 + return Html::a('<img src="/images/delete-ico.png" alt="">', [
  114 + 'projects-delete',
  115 + 'id' => $model->project_id,
  116 + ], [
  117 + 'title' => Yii::t('app', 'delete'),
  118 + 'aria-label' => Yii::t('app', 'delete'),
  119 + 'data-confirm' => Yii::t('app', 'delete_confirm'),
  120 + 'data-method' => 'post',
  121 + 'data-pjax' => '0',
  122 + ]);
  123 + },
  124 + ],
  125 + 'template' => '{update} {delete}',
123 126 ],
124   - 'template' => '{update} {delete}',
125 127 ],
126   - ],
127   -]); ?>
  128 + ]); ?>
  129 +</div>
  130 +
... ...
frontend/views/ajax/project_user.php
  Show/Hide comments   View file @44baee6
... ... @@ -34,6 +34,6 @@
34 34 <?=Html::activeInput('number', $model, "[{$user->id}]time", ['class' => 'form-control'])?>
35 35 </div>
36 36 <div class="form-group" style="display:inline-block">
37   - <span class="project_user_remove" style="background: url('/images/delete-ico.png'); width: 15px; height: 15px; display: block; background-size: cover; cursor:pointer"></span>
  37 + <span class="project_user_remove" style="background: url('/images/delete-ico.png'); width: 13px; height: 13px; display: block; background-size: cover; cursor:pointer"></span>
38 38 </div>
39 39 </div>
... ...
frontend/views/layouts/admin.php
  Show/Hide comments   View file @44baee6
... ... @@ -55,7 +55,7 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
55 55 'active' => preg_match('/^portfolio.*$/', $this->context->action->id)?true:false,
56 56 ],
57 57 [
58   - 'label' => "Портфолио участник <span class='badge'>{$this->params['portfolio_user_count']}</span>",
  58 + 'label' => "Портфолио участник <span class='ico_num'>{$this->params['portfolio_user_count']}</span>",
59 59 'encode' => false,
60 60 'url' => ['accounts/participant'],
61 61 'active' => preg_match('/^participant.*$/', $this->context->action->id)?true:false,
... ...
frontend/views/layouts/main.php
  Show/Hide comments   View file @44baee6
... ... @@ -39,8 +39,8 @@ AppAsset::register($this);
39 39 <a href="/"><img class="logo" src="/images/logo.png" width="100" height="68" alt=""/></a>
40 40 <div class="header-proektant-slogan">Международная Федерация Проектантов</div>
41 41 <ul class="header-contacts-menu">
42   - <li><span><img src="/images/ico-contact.png" alt=""/></span><?= Html::a('Контакты','', ['class' =>'contactsLinkModalFirst'])?></li>
43   - <li><span><img src="/images/ico-question.png" alt=""/></span><?= Html::a('Помощь',['/site/help'], ['class' =>'contactsLinkModal'])?></li>
  42 + <li><span><img src="/images/icon_question_01.png" alt=""/></span><?= Html::a('Задать вопрос','', ['class' =>'contactsLinkModalFirst'])?></li>
  43 + <li><span><img src="/images/icon_help_01.png" alt=""/></span><?= Html::a('Помощь',['/site/help'], ['class' =>'contactsLinkModal'])?></li>
44 44 </ul>
45 45 <div class="header-cabinet-wr">
46 46 <?php
... ... @@ -113,7 +113,7 @@ AppAsset::register($this);
113 113 </div>
114 114 </li>
115 115 <li>
116   - <span>Компаням</span>
  116 + <span>Компаниям</span>
117 117 <div class="main-menu-hover">
118 118 <ul>
119 119  
... ...
frontend/web/css/style.css
  Show/Hide comments   View file @44baee6
... ... @@ -146,12 +146,13 @@ ul.header-contacts-menu li span {
146 146 }
147 147 ul.header-contacts-menu li a {
148 148 color: #0072bc;
149   - text-decoration: underline;
  149 + text-decoration: none;
150 150 font-size: 13px;
151 151 height: 20px;
152 152 display: block;
153 153 line-height: 20px;
154 154 }
  155 +ul.header-contacts-menu li a:hover {text-decoration: underline}
155 156 ul.header-contacts-menu li:last-child a {
156 157 text-decoration: dashed;
157 158 }
... ... @@ -185,7 +186,7 @@ ul.header-contacts-menu li:last-child a {
185 186 }
186 187 .header-cabinet-wr a {
187 188 float: left;
188   - text-decoration: underline;
  189 + text-decoration: none;
189 190 color: #0072bc;
190 191 font-size: 13px;
191 192 transition: 0.3s;
... ... @@ -196,7 +197,7 @@ ul.header-contacts-menu li:last-child a {
196 197 height: 15px;
197 198 white-space: nowrap;
198 199 }
199   -.header-cabinet-wr a:hover{opacity: 0.9}
  200 +.header-cabinet-wr a:hover{opacity: 0.9; text-decoration: underline}
200 201 .header-cabinet-wr a:before{
201 202 content: '';
202 203 height: 15px;
... ... @@ -2535,6 +2536,8 @@ input[type=file]::-webkit-file-upload-button {
2535 2536 appearance: none;
2536 2537 background-color: transparent;
2537 2538 margin-bottom: 16px;
  2539 + padding-left: 8px;
  2540 + margin-top: 5px;
2538 2541 }
2539 2542  
2540 2543 .search-work-form select option:first-child{border-top: none}
... ... @@ -3362,7 +3365,7 @@ ul.proektant-comments {margin-top: 15px}
3362 3365 width: 104px;
3363 3366 height: 41px;
3364 3367 float: right;
3365   - margin-right: 20px;
  3368 + margin-right: 38px;
3366 3369 position: relative;
3367 3370 }
3368 3371 .main-menu-icons-wr a{
... ... @@ -4098,7 +4101,9 @@ ul.min_markers_two
4098 4101 }
4099 4102 .cabinet-list li:first-child{margin-left: 0}
4100 4103 .cabinet-list li img {margin-top: 4px; float: left; margin-right: 10px}
4101   -.cabinet-list li span{ border-bottom: 1px solid #333333;}
  4104 +.cabinet-list li span{
  4105 + /*border-bottom: 1px solid #333333;*/
  4106 +}
4102 4107 .cabinet-list a {color: inherit}
4103 4108 .left-proektant-cabinet .navi-buttons-yet-wr {margin-bottom: 50px}
4104 4109 .right-proektant-cabinet-candidate, .right-proektant-cabinet-message, .right-proektant-cabinet-message-new {
... ... @@ -4646,7 +4651,7 @@ ul.download-list-files li:hover .download-link {transition: 0.2s; opacity: 1; -m
4646 4651 float: left;
4647 4652 }
4648 4653  
4649   -.custom-input-2 {
  4654 +.custom-input-2, input.hasDatepicker {
4650 4655 width: 300px;
4651 4656 height: 29px;
4652 4657 border: 1px solid #dcdcdc;
... ... @@ -4661,12 +4666,13 @@ ul.download-list-files li:hover .download-link {transition: 0.2s; opacity: 1; -m
4661 4666 outline: none;
4662 4667 }
4663 4668 .custom-input-2.fix-input-2 {width: 100%}
4664   -.custom-input-2:focus, .selectize-input input:focus {border: 1px solid #dcdcdc;box-shadow: 1px 2px 2px 0px rgba(215, 215, 215, 0.75) inset; transition: 0.1s; outline: none}
  4669 +.custom-input-2:focus, .selectize-input input:focus, .search-work-form select:focus, input.hasDatepicker:focus {border: 1px solid #dcdcdc;box-shadow: 1px 2px 2px 0px rgba(215, 215, 215, 0.75) inset; transition: 0.1s; outline: none}
4665 4670 .input-blocks select {margin-top: 5px}
4666 4671 .input-blocks label, .skills-title {
4667 4672 font-size: 13px;
4668 4673 color: inherit;
4669 4674 font-weight: 700;
  4675 + position: relative;
4670 4676 }
4671 4677  
4672 4678 .input-blocks-help-wr {
... ... @@ -5060,9 +5066,17 @@ input.disabled.admin-check:checked + label, input.disabled.admin-check:checked +
5060 5066 color: #D40000;
5061 5067 position: absolute;
5062 5068 top: 32px;
5063   - left: -15px;
  5069 + left: -12px;
5064 5070 width: 15px;
5065 5071 }
  5072 +.input-blocks .required label:before {
  5073 + display: block;
  5074 + content: "*";
  5075 + color: #D40000;
  5076 + position: absolute;
  5077 + top: 0px;
  5078 + right: -10px;
  5079 +}
5066 5080 .input-blocks .required.required-no-star:before {
5067 5081 display: none;
5068 5082 }
... ... @@ -5549,14 +5563,13 @@ ul.menu-admin li:hover a{
5549 5563 color: #62b8ef;
5550 5564 transition: 0.2s;
5551 5565 }
  5566 +ul.menu-admin li:hover a .ico_num {color: #fff}
5552 5567 ul.menu-admin li.active-menu-admin {background: #62b8ef;}
5553 5568 ul.menu-admin li.active-menu-admin a{color: #fff}
5554 5569 ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last-child, ul.menu-admin li:last-child a{
5555 5570 height: 34px;
5556 5571 line-height: 34px;
5557 5572 }
5558   -
5559   -
5560 5573 .login-left-column-title {border-bottom: 1px solid #dbdbdb; margin-top: 15px; padding-bottom: 27px;}
5561 5574 .login-left-column-title, .login-left-column-title h1{font-size: 18px}
5562 5575 .form-group{margin-bottom: 0}
... ... @@ -5577,17 +5590,15 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last-
5577 5590 width: 595px;
5578 5591 float: right;
5579 5592 }
5580   -.general-check { height: 30px; position: relative }
  5593 +.general-check-right p {margin:0 !important; color: #333}
  5594 +.general-check {position: relative; width: 100%; float: left; margin-top: 10px; }
  5595 +.general-check:first-child {margin-top: 0}
5581 5596 .general-check-right-txt {
5582 5597 font-size: 13px;
5583 5598 color: #b7b7b7;
5584   - display: table-cell;
5585   - vertical-align: middle;
5586   - height: 19px;
5587   -}
5588   -.general-check-right-txt-fix {
5589   - height: 30px;
  5599 + display: block;
5590 5600 }
  5601 +
5591 5602 .general-check input.custom-check + label span {margin-top: 4px;}
5592 5603 .gen-admin-title {
5593 5604 font-size: 18px;
... ... @@ -5825,11 +5836,15 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last-
5825 5836 background-image: none;
5826 5837 background: #dcdcdc !important;
5827 5838 padding-top: 9px;
  5839 + box-shadow: none !important;
5828 5840 }
5829 5841 .admin-editor-bl .cke_bottom {
5830 5842 background-image: none;
5831 5843 background: #dcdcdc !important;
5832 5844 }
  5845 +.admin-editor-bl .cke_reset, .admin-editor-bl .cke_chrome {
  5846 + box-shadow: none !important;
  5847 +}
5833 5848 .remove.input-blocks-wrapper button {margin-left: 10px}
5834 5849 .data-block {font-size: 13px; color: #b7b7b7; text-align: right}
5835 5850 .hidden-foto .file-uploader-block, .hidden-foto .tst, .hidden-foto .admin-avatar-pattern-wr {width: 100%}
... ... @@ -6456,6 +6471,7 @@ input[disabled], select[disabled] {
6456 6471 padding-left: 8px;
6457 6472 width: 85px;
6458 6473 float: left;
  6474 + margin-top: 0;
6459 6475 }
6460 6476 .admin-table-portfolio .input-group.input-group-xs input:focus{
6461 6477 box-shadow: 1px 2px 2px 0px rgba(215, 215, 215, 0.75) inset; transition: 0.1s; outline: none
... ... @@ -6742,3 +6758,68 @@ input[disabled], select[disabled] {
6742 6758 .add_project_user_wrapper .add_project_user_link {
6743 6759 cursor: pointer;
6744 6760 }
  6761 +.ico_num {
  6762 + background: #62b8ef;
  6763 + height: 18px;
  6764 + min-width: 18px;
  6765 + padding: 0 2px;
  6766 + line-height: 18px;
  6767 + display: block;
  6768 + text-align: center;
  6769 + position: absolute;
  6770 + top: 50%;
  6771 + right: 7px;
  6772 + margin-top: -10px;
  6773 + border-radius: 4px;
  6774 +}
  6775 +li.active-menu-admin .ico_num {
  6776 + background: #0072BC;
  6777 + color: #62b8ef;
  6778 +}
  6779 +li.active-menu-admin:hover a .ico_num {
  6780 + color: #62b8ef !important;
  6781 +}
  6782 +/***form-rating***/
  6783 +.search-work-form .ui-widget {
  6784 + height: 1px;
  6785 + border: 0;
  6786 + background: #0072bc;
  6787 +}
  6788 +.search-work-form .ui-state-default {
  6789 + background: #0072bc;
  6790 + border-radius: 100%;
  6791 + outline: none;
  6792 + margin-top: -5px;
  6793 +}
  6794 +.search-work-form .ui-state-hover {
  6795 + background: #0072bc;
  6796 +}
  6797 +.search-work-form #w0-rating {
  6798 + font-family: inherit;
  6799 + font-size: 13px;
  6800 + color: inherit;
  6801 +}
  6802 +/*****************/
  6803 +.hint-link .hint-block {
  6804 + font-size: 13px;
  6805 + position: absolute;
  6806 + top: 50%;
  6807 + margin-top: 5px;
  6808 + left: 310px;
  6809 + color: #b7b7b7;
  6810 +}
  6811 +.hint-link.hint-link-fx .hint-block{
  6812 + margin-left: 36px;
  6813 +}
  6814 +.attention_bl {
  6815 + font-size: 13px;
  6816 + color: #D40000;
  6817 + margin-top: 12px;
  6818 +}
  6819 +.hint-link.hint-link-check .hint-block {
  6820 + top:0;
  6821 + margin-top: -3px;
  6822 + left: 133px;
  6823 +}
  6824 +.hint-link-check {margin-top: 23px}
  6825 +.fix-color-datepicker .ui-datepicker-title {color: #fff}
... ...
frontend/web/images/icon_help_01.png 0 → 100644
View file @44baee6

13.4 KB
frontend/web/images/icon_question_01.png 0 → 100644
View file @44baee6

13.3 KB