Administrator / test_3

Commit b274352950b7eda422f1556beed5df70aff2c56b

Authored by Виталий
1 parent 47559a4b

tokar commit

Showing 7 changed files with 309 additions and 136 deletions   Show diff stats
Inline Side-by-side
common/widgets/views/courses_field.php
  Show/Hide comments   View file @b274352
... ... @@ -10,6 +10,7 @@
10 10  
11 11 <div class="field_list">
12 12 <?php $t = 0;
  13 + $label = 0; // add this var
13 14 for($i = 1; $i <= count($model); $i++):
14 15 $row = $i;
15 16  
... ... @@ -19,8 +20,14 @@
19 20 'class' => 'form-group',
20 21 'id' => isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0,
21 22 ]) ?>
22   - <input type="text" placeholder="Курсы, тренинги" class="form-control" value="<?= isset( $model[ $t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[courses][<?= $row ?>][0][name]"/>
23   - <input type="number" class="form-control" value="<?= isset( $model[ ++$t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[courses][<?= $row ?>][1][year]"/>
  23 + <div class="input-blocks">
  24 + <input id="cours-name-<?= ++$label ?>" type="text" placeholder="" class="form-control custom-input-2" value="<?= isset( $model[ $t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[courses][<?= $row ?>][0][name]"/>
  25 + <label for="cours-name-<?= $label ?>">Название</label>
  26 + </div>
  27 + <div class="input-blocks">
  28 + <input id="cours-year-<?= ++$label ?>" type="number" class="form-control custom-input-2 custom-input-2-date" value="<?= isset( $model[ ++$t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[courses][<?= $row ?>][1][year]"/>
  29 + <label for="cours-year-<?= $label ?>">год</label>
  30 + </div>
24 31 <span data-id="<?= isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0 ?>" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>
25 32 <?= Html::endTag('div') ?>
26 33 <?php $i = ++$t; ?>
... ... @@ -30,6 +37,7 @@
30 37 </fieldset>
31 38 <script>
32 39 var start_i_<?=$this->context->id?> = <?=$i?>;
  40 + var start_label_<?=$this->context->id?> = <?=$label?>; // add this var
33 41 $ (document)
34 42 .ready (
35 43 function ()
... ... @@ -43,8 +51,14 @@
43 51 var block_id = $ (this)
44 52 .parent ('fieldset');
45 53 var sub_block = '<div class="form-group" >' +
46   - '<input type="text" placeholder="Курсы, тренинги" class="form-control" value="" name="Fields[courses][' + start_i_<?=$this->context->id?> + '][0][name]" />' +
47   - '<input type="number" class="form-control" value="" name="Fields[courses][' + start_i_<?=$this->context->id?>++ + '][1][year]" />' +
  54 + '<div class="input-blocks">'+
  55 + '<input id="cours-name-' + ++start_label_<?=$this->context->id?> +'" type="text" placeholder="" class="form-control custom-input-2" value="" name="Fields[courses][' + start_i_<?=$this->context->id?>++ + '][0][name]" />' +
  56 + '<label for="cours-name-' + start_label_<?=$this->context->id?> +'">Название</label>'+
  57 + '</div>'+
  58 + '<div class="input-blocks">'+
  59 + '<input id="cours-year-' + ++start_label_<?=$this->context->id?> +'" type="number" class="form-control custom-input-2 custom-input-2-date" value="" name="Fields[courses][' + start_i_<?=$this->context->id?>++ + '][1][year]" />' +
  60 + '<label for="cours-year-' + start_label_<?=$this->context->id?> +'">год</label>'+
  61 + '</div>'+
48 62 '<span title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>' +
49 63 '<div>';
50 64 block.append (sub_block);
... ...
common/widgets/views/development_field.php
  Show/Hide comments   View file @b274352
... ... @@ -8,6 +8,7 @@
8 8  
9 9 <div class="field_list">
10 10 <?php $t = 0;
  11 + $label = 0; // add this var
11 12 for($i = 1; $i <= count($model); $i++):
12 13 $row = $i;
13 14  
... ... @@ -17,9 +18,15 @@
17 18 'class' => 'form-group',
18 19 'id' => isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0,
19 20 ]) ?>
20   - <input type="text" placeholder="Название" class="form-control" value="<?= isset( $model[ $t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[development][<?= $row ?>][0][name]"/>
21   - <input type="number" class="form-control" value="<?= isset( $model[ ++$t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[development][<?= $row ?>][1][year]"/>
22   - <span data-id="<?= isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0 ?>" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>
  21 + <div class="input-blocks">
  22 + <input id="dev-name-<?= ++$label ?>" type="text" placeholder="" class="form-control custom-input-2" value="<?= isset( $model[ $t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[development][<?= $row ?>][0][name]"/>
  23 + <label for="dev-name-<?= $label ?>">Название</label>
  24 + </div>
  25 + <div class="input-blocks">
  26 + <input id="dev-year-<?= ++$label ?>" type="number" class="form-control custom-input-2 custom-input-2-date" value="<?= isset( $model[ ++$t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[development][<?= $row ?>][1][year]"/>
  27 + <label for="dev-year-<?= $label ?>">год</label>
  28 + </div>
  29 + <span data-id="<?= isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0 ?>" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>
23 30 <?= Html::endTag('div') ?>
24 31 <?php $i = ++$t; ?>
25 32 <?php endfor; ?>
... ... @@ -29,6 +36,7 @@
29 36 </fieldset>
30 37 <script>
31 38 var start_i_<?=$this->context->id?> = <?=$i?>;
  39 + var start_label_<?=$this->context->id?> = <?=$label?>; // add this var
32 40 $ (document)
33 41 .ready (
34 42 function ()
... ... @@ -42,8 +50,14 @@
42 50 var block_id = $ (this)
43 51 .parent ('fieldset');
44 52 var sub_block = '<div class="form-group" >' +
45   - '<input type="text" placeholder="Телефон" class="form-control" value="" name="Fields[development][' + start_i_<?=$this->context->id?> + '][0][name]" />' +
46   - '<input type="number" class="form-control" value="" name="Fields[development][' + start_i_<?=$this->context->id?>++ + '][1][year]" />' +
  53 + '<div class="input-blocks">'+
  54 + '<input id="dev-name-' + ++start_label_<?=$this->context->id?> +'" type="text" placeholder="Телефон" class="form-control custom-input-2" value="" name="Fields[development][' + start_i_<?=$this->context->id?>++ + '][0][name]" />' +
  55 + '<label for="dev-name-' + start_label_<?=$this->context->id?> +'">Название</label>'+
  56 + '</div>'+
  57 + '<div class="input-blocks">'+
  58 + '<input id="dev-year-' + ++start_label_<?=$this->context->id?> +'" type="number" class="form-control custom-input-2 custom-input-2-date" value="" name="Fields[development][' + start_i_<?=$this->context->id?>++ + '][1][year]" />' +
  59 + '<label for="dev-year-' + start_label_<?=$this->context->id?> +'">год</label>'+
  60 + '</div>'+
47 61 '<span title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>' +
48 62 '<div>';
49 63 console.log (block);
... ...
common/widgets/views/education_field.php
  Show/Hide comments   View file @b274352
... ... @@ -21,22 +21,25 @@
21 21 'class' => 'form-group',
22 22 'id' => isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0,
23 23 ]) ?>
24   - <input id="edu-name-<?= ++$label ?>" type="text" placeholder="Название" class="form-control custom-input-2" value="<?= isset( $model[ $t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[education][<?= $row ?>][0][name]"/>
25   - <label for="edu-name-<?= $label ?>"></label>
26   -
27   - <input id="edu-to-<?= ++$label ?>" type="number" class="form-control form-control custom-input-2 custom-input-2-date" value="<?= isset( $model[ ++$t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[education][<?= $row ?>][1][year_from]"/>
28   - <label for="edu-to-<?= $label ?>"></label>
29   -
30   - <input id="edu-out-<?= ++$label ?>" type="number" class="form-control form-control custom-input-2 custom-input-2-date" value="<?= isset( $model[ ++$t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[education][<?= $row ?>][2][year_to]"/>
31   - <label for="edu-out-<?= $label ?>"></label>
32   -
  24 + <div class="input-blocks">
  25 + <input id="edu-name-<?= ++$label ?>" type="text" placeholder="Название" class="form-control custom-input-2" value="<?= isset( $model[ $t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[education][<?= $row ?>][0][name]"/>
  26 + <label for="edu-name-<?= $label ?>">Название ВУЗа</label>
  27 + </div>
  28 + <div class="input-blocks">
  29 + <input id="edu-to-<?= ++$label ?>" type="number" class="form-control form-control custom-input-2 custom-input-2-date" value="<?= isset( $model[ ++$t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[education][<?= $row ?>][1][year_from]"/>
  30 + <label for="edu-to-<?= $label ?>">год начала</label>
  31 + </div>
  32 + <div class="input-blocks">
  33 + <input id="edu-out-<?= ++$label ?>" type="number" class="form-control form-control custom-input-2 custom-input-2-date" value="<?= isset( $model[ ++$t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[education][<?= $row ?>][2][year_to]"/>
  34 + <label for="edu-out-<?= $label ?>">год окончания</label>
  35 + </div>
33 36 <span data-id="<?= isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0 ?>" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>
34 37 <?= Html::endTag('div') ?>
35 38 <?php $i = ++$t; ?>
36 39 <?php endfor; ?>
37 40  
38 41 </div>
39   - <p class="btn btn-success add_field_<?= $this->context->id ?>">Добавить поле</p>
  42 + <p class="btn btn-success add_field_<?= $this->context->id ?>">добавить еще</p>
40 43 </fieldset>
41 44  
42 45 <script>
... ... @@ -55,12 +58,18 @@
55 58 var block_id = $ (this)
56 59 .parent ('fieldset');
57 60 var sub_block = '<div class="form-group" >' +
58   - '<input id="edu-name-' + ++start_label_<?=$this->context->id?> +'" type="text" placeholder="" class="form-control custom-input-2" value="" name="Fields[education][' + start_i_<?=$this->context->id?> + '][0][name]" />' +
59   - '<label for="edu-name-' + start_label_<?=$this->context->id?> +'"></label>'+
60   - '<input id="edu-to-' + ++start_label_<?=$this->context->id?> +'" type="number" class="form-control custom-input-2 custom-input-2-date" value="" name="Fields[education][' + start_i_<?=$this->context->id?> + '][1][year_from]" />' +
61   - '<label for="edu-to-' + start_label_<?=$this->context->id?> +'"></label>'+
  61 + '<div class="input-blocks">'+
  62 + '<input id="edu-name-' + ++start_label_<?=$this->context->id?> +'" type="text" placeholder="" class="form-control custom-input-2" value="" name="Fields[education][' + start_i_<?=$this->context->id?>++ + '][0][name]" />' +
  63 + '<label for="edu-name-' + start_label_<?=$this->context->id?> +'">Название ВУЗа</label>'+
  64 + '</div>'+
  65 + '<div class="input-blocks">'+
  66 + '<input id="edu-to-' + ++start_label_<?=$this->context->id?> +'" type="number" class="form-control custom-input-2 custom-input-2-date" value="" name="Fields[education][' + start_i_<?=$this->context->id?>++ + '][1][year_from]" />' +
  67 + '<label for="edu-to-' + start_label_<?=$this->context->id?> +'">год начала</label>'+
  68 + '</div>'+
  69 + '<div class="input-blocks">'+
62 70 '<input id="edu-out-' + ++start_label_<?=$this->context->id?> +'"" type="number" class="form-control custom-input-2 custom-input-2-date" value="" name="Fields[education][' + start_i_<?=$this->context->id?>++ + '][2][year_to]" />' +
63   - '<label for="edu-out-' + start_label_<?=$this->context->id?> +'"></label>'+
  71 + '<label for="edu-out-' + start_label_<?=$this->context->id?> +'">год окончания</label>'+
  72 + '</div>'+
64 73 '<span title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>' +
65 74 '<div>';
66 75 console.log (block);
... ...
frontend/views/accounts/add-skills.php
  Show/Hide comments   View file @b274352
... ... @@ -17,7 +17,7 @@ use \common\widgets\MultiLangForm;
17 17 $form = ActiveForm::begin();
18 18 ?>
19 19 <div class="skills-admin-wrapper style">
20   - <div class="input-blocks-wrapper">
  20 + <div class="input-blocks-wrapper skills-programs">
21 21 <div class="input-blocks">
22 22 <?= FieldEditor::widget (
23 23 [
... ... @@ -27,39 +27,39 @@ use \common\widgets\MultiLangForm;
27 27 </div>
28 28 </div>
29 29  
30   - <div class="input-blocks-wrapper">
31   - <div class="input-blocks">
  30 + <div class="input-blocks-wrapper skills-add-wr education-skills">
  31 +
32 32 <?= FieldEditor::widget (
33 33 [
34 34 'template' => 'education', 'item_id' => $user->id, 'model' => 'common\models\User', 'language' => 'ru',
35 35 ]
36 36 ); ?>
37   - </div>
  37 +
38 38 </div>
39 39  
40   - <div class="input-blocks-wrapper">
41   - <div class="input-blocks">
  40 + <div class="input-blocks-wrapper skills-add-wr education-skills">
  41 +
42 42 <?= FieldEditor::widget (
43 43 [
44 44 'template' => 'development', 'item_id' => $user->id, 'model' => 'common\models\User', 'language' => 'ru',
45 45 ]
46 46 ); ?>
47   - </div>
  47 +
48 48 </div>
49 49  
50   - <div class="input-blocks-wrapper">
51   - <div class="input-blocks">
  50 + <div class="input-blocks-wrapper skills-add-wr education-skills">
  51 +
52 52 <?= FieldEditor::widget (
53 53 [
54 54 'template' => 'courses', 'item_id' => $user->id, 'model' => 'common\models\User', 'language' => 'ru',
55 55 ]
56 56 ); ?>
57   - </div>
  57 +
58 58 </div>
59 59  
60 60 <div class="input-blocks-wrapper">
61   - <div class="input-blocks">
62   - <?= Html::submitButton('Обновить') ?>
  61 + <div class="admin-save-btn skills-save-btn style">
  62 + <?= Html::submitButton('Сохранить',['class'=>'input-blocks-wrapper button']) ?>
63 63 </div>
64 64 </div>
65 65 </div>
... ...
frontend/views/accounts/employment.php
  Show/Hide comments   View file @b274352
1 1 <?php
2   - /**
3   - * @var Job[] $job
4   - */
5   - use common\models\Job;
6   - use yii\helpers\Html;
7   - use yii\jui\DatePicker;
8   - use yii\widgets\ActiveForm;
9   -
10   - $this->title = 'Трудовой стаж';
11   - $this->params['breadcrumbs'][] = $this->title;
  2 +/**
  3 + * @var Job[] $job
  4 + */
  5 +use common\models\Job;
  6 +use yii\helpers\Html;
  7 +use yii\jui\DatePicker;
  8 +use yii\widgets\ActiveForm;
  9 +
  10 +$this->title = 'Трудовой стаж';
  11 +$this->params['breadcrumbs'][] = $this->title;
12 12 ?>
13   - <h1><?= $this->title ?></h1>
  13 +<div class="login-left-column-title"><?= $this->title ?></div>
14 14 <?php
15   - $form = ActiveForm::begin ();
16   - $current = array_shift ($job);
  15 +$form = ActiveForm::begin ();
  16 +$current = array_shift ($job);
17 17 ?>
18   - <div class="current_job_container">
19   - <p>Текущее место работы:</p>
20   - <div class="current_job_inputs">
21   - <?php
22   - echo $form->field ($current, '[0]name')
23   - ->label ('Название')
24   - ->textInput ();
25   - echo $form->field ($current, '[0]link')
26   - ->label ('Ссылка на компанию на сайте МФП')
27   - ->textInput ();
28   - echo $form->field ($current, '[0]date_start')
29   - ->label ('Дата начала работы')
30   - ->widget (DatePicker::className (), ['language' => 'ru', 'dateFormat' => 'dd-MM-yyyy']);
31   - echo $form->field ($current, '[0]position')
32   - ->label ('Должность')
33   - ->textInput ();
34   - echo $form->field ($current, '[0]total_count')
35   - ->label ('Количество проектов, в которых принимали участие')
36   - ->input ('number');
37   - echo $form->field ($current, '[0]complete_count')
38   - ->label ('из них реализовано')
39   - ->input ('number');
40   - ?>
  18 +<div class="current_job_container">
  19 + <div class="login-left-column-title-two style">Текущее место работы:</div>
  20 + <div class="current_job_inputs">
  21 + <div class="input-blocks-wrapper">
  22 + <div class="input-blocks">
  23 + <?= $form->field ($current, '[0]name')
  24 + ->label ('Название')
  25 + ->textInput (['class'=> 'custom-input-2']);
  26 + ?>
  27 + </div>
  28 + </div>
  29 +
  30 + <div class="input-blocks-wrapper">
  31 + <div class="input-blocks">
  32 + <?= $form->field ($current, '[0]link')
  33 + ->label ('Ссылка на компанию на сайте МФП')
  34 + ->textInput (['class'=> 'custom-input-2']);
  35 + ?>
  36 + </div>
  37 + </div>
  38 +
  39 + <div class="input-blocks-wrapper">
  40 + <div class="input-blocks">
  41 + <?= $form->field ($current, '[0]position')
  42 + ->label ('Должность')
  43 + ->textInput (['class'=> 'custom-input-2']);
  44 + ?>
  45 + </div>
  46 + </div>
  47 +
  48 + <div class="input-blocks-wrapper">
  49 + <div class="input-blocks">
  50 + <?= $form->field ($current, '[0]date_start')
  51 + ->label ('Дата начала работы')
  52 + ->widget (DatePicker::className (), ['language' => 'ru', 'dateFormat' => 'dd-MM-yyyy']);
  53 + ?>
  54 + </div>
41 55 </div>
  56 +
  57 + <div class="input-blocks-wrapper">
  58 + <div class="input-blocks">
  59 + <?= $form->field ($current, '[0]total_count')
  60 + ->label ('Количество проектов, в которых принимали участие')
  61 + ->textInput (['class'=> 'custom-input-2','type'=>'number']);
  62 + ?>
  63 + </div>
  64 + </div>
  65 +
  66 + <div class="input-blocks-wrapper">
  67 + <div class="input-blocks">
  68 + <?= $form->field ($current, '[0]complete_count')
  69 + ->label ('из них реализовано')
  70 + ->textInput (['class'=> 'custom-input-2','type'=>'number']);
  71 + ?>
  72 + </div>
  73 + </div>
  74 +
42 75 </div>
43   - <div class="prev_job_container">
44   - <p>Предыдущие места работы</p>
  76 +</div>
  77 +<div class="prev_job_container">
  78 + <p>Предыдущие места работы</p>
  79 + <?php
  80 + foreach ($job as $index => $job_model)
  81 + {
  82 + ?>
  83 +
  84 + <div class='prev_job_inputs'>
  85 + <div class="input-blocks-wrapper">
  86 + <div class="input-blocks">
  87 + <?= $form->field ($job_model, '['. ($index + 1) .']name')
  88 + ->label ('Название')
  89 + ->textInput (['class'=> 'custom-input-2']);
  90 + ?>
  91 + </div>
  92 +</div>
  93 +
  94 + <div class="input-blocks-wrapper">
  95 + <div class="input-blocks">
  96 + <?= $form->field ($job_model, '['. ($index + 1) .']link')
  97 + ->label ('Ссылка на компанию на сайте МФП')
  98 + ->textInput (['class'=> 'custom-input-2']);
  99 + ?>
  100 + </div>
  101 + </div>
  102 +
  103 + <div class="input-blocks-wrapper">
  104 + <div class="input-blocks">
  105 + <?= $form->field ($current, '[0]date_start', ['options' => ['class' => 'test2class']])
  106 + ->label ('Дата начала работы')
  107 + ->widget (DatePicker::className (), ['options' => ['class' => 'custom-input-2'], 'language' => 'ru', 'dateFormat' => 'dd-MM-yyyy', 'clientOptions' => ['changeYear' => true, 'yearRange' => 'c-20:c', 'changeMonth' => true]]);
  108 + ?>
  109 + </div>
  110 + </div>
  111 +
  112 + <div class="input-blocks-wrapper">
  113 + <div class="input-blocks">
  114 + <?= $form->field ($job_model, '['. ($index + 1) .']date_end')
  115 + ->label ('Дата окончания работы')
  116 + ->widget (DatePicker::className (), ['language' => 'ru', 'dateFormat' => 'dd-MM-yyyy']);
  117 + ?>
  118 + </div>
  119 + </div>
  120 +
  121 + <div class="input-blocks-wrapper">
  122 + <div class="input-blocks">
  123 + <?= $form->field ($job_model, '['. ($index + 1) .']position')
  124 + ->label ('Должность')
  125 + ->textInput (['class'=> 'custom-input-2']);
  126 + ?>
  127 + </div>
  128 + </div>
  129 +
  130 + <div class="input-blocks-wrapper">
  131 + <div class="input-blocks">
  132 + <?= $form->field ($job_model, '['. ($index + 1) .']total_count')
  133 + ->label ('Количество проектов, в которых принимали участие')
  134 + ->textInput (['class'=> 'custom-input-2','type'=>'number']);
  135 + ?>
  136 + </div>
  137 + </div>
  138 +
  139 + <div class="input-blocks-wrapper">
  140 + <div class="input-blocks">
  141 + <?= $form->field ($job_model, '['. ($index + 1) .']complete_count')
  142 + ->label ('из них реализовано')
  143 + ->textInput (['class'=> 'custom-input-2','type'=>'number']);
  144 + ?>
  145 + </div>
  146 + </div>
  147 +
  148 + </div>
  149 + <?php } ?>
  150 +
  151 + </div>
45 152 <?php
46   - foreach ($job as $index => $job_model)
47   - {
48   - echo "<div class='prev_job_inputs'>";
49   - echo $form->field ($job_model, '['. ($index + 1) .']name')
50   - ->label ('Название')
51   - ->textInput ();
52   - echo $form->field ($job_model, '['. ($index + 1) .']link')
53   - ->label ('Ссылка на компанию на сайте МФП')
54   - ->textInput ();
55   - echo $form->field ($job_model, '['. ($index + 1) .']date_start')
56   - ->label ('Дата начала работы')
57   - ->widget (DatePicker::className (), ['language' => 'ru', 'dateFormat' => 'dd-MM-yyyy']);
58   - echo $form->field ($job_model, '['. ($index + 1) .']date_end')
59   - ->label ('Дата окончания работы')
60   - ->widget (DatePicker::className (), ['language' => 'ru', 'dateFormat' => 'dd-MM-yyyy']);
61   - echo $form->field ($job_model, '['. ($index + 1) .']position')
62   - ->label ('Должность')
63   - ->textInput ();
64   - echo $form->field ($job_model, '['. ($index + 1) .']total_count')
65   - ->label ('Количество проектов, в которых принимали участие')
66   - ->input ('number');
67   - echo $form->field ($job_model, '['. ($index + 1) .']complete_count')
68   - ->label ('из них реализовано')
69   - ->input ('number');
70   - echo "</div>";
71   - }
  153 + echo Html::button('Добавить место работы', ['id' => 'add_job_button']);
  154 + echo Html::submitButton('Обновить');
  155 + $form->end ();
72 156 ?>
73   - </div>
74   -<?php
75   - echo Html::button('Добавить место работы', ['id' => 'add_job_button']);
76   - echo Html::submitButton('Обновить');
77   - $form->end ();
78   -?>
79   -<script>
80   - $(function() {
81   - var regexp = /^[\w]+\[(\d+)\].*$/;
82   - $(document).on('click', '#add_job_button', function() {
83   - var inputs = $('.prev_job_inputs').last();
84   - var name = $(inputs).find('input, textarea').first().attr('name');
85   - var lastindex = regexp.exec(name)[1];
86   - $.get('/accounts/get-form', { lastindex: lastindex }, function(data) {
87   - $('.prev_job_container').append($(data).find('.ajax-loaded').first().html());
88   - $(data).filter('script').appendTo('body');
  157 + <script>
  158 + $(function() {
  159 + var regexp = /^[\w]+\[(\d+)\].*$/;
  160 + $(document).on('click', '#add_job_button', function() {
  161 + var inputs = $('.prev_job_inputs').last();
  162 + var name = $(inputs).find('input, textarea').first().attr('name');
  163 + var lastindex = regexp.exec(name)[1];
  164 + $.get('/accounts/get-form', { lastindex: lastindex }, function(data) {
  165 + $('.prev_job_container').append($(data).find('.ajax-loaded').first().html());
  166 + $(data).filter('script').appendTo('body');
  167 + });
  168 + });
89 169 });
90   - });
91   - });
92   -</script>
  170 + </script>
... ...
frontend/views/accounts/setting.php
  Show/Hide comments   View file @b274352
... ... @@ -12,7 +12,7 @@
12 12 $this->params['breadcrumbs'][] = $this->title;
13 13 ?>
14 14  
15   -<h1><?= $this->title ?></h1>
  15 +<div class="login-left-column-title"><?= $this->title ?></div>
16 16  
17 17 <?php
18 18 if (\Yii::$app->session->hasFlash ('passwordupdate'))
... ... @@ -27,18 +27,38 @@
27 27 <?
28 28 }
29 29 $form = ActiveForm::begin ();
30   - echo "<p>Сменить пароль:</p>";
31   - echo $form->field ($user, 'old_password', ['template' => "{input}{label}\n{hint}\n{error}"])
32   - ->label ('Старый пароль')
33   - ->passwordInput (['value' => '']);
34   - echo $form->field ($user, 'new_password', ['template' => "{input}{label}\n{hint}\n{error}"])
35   - ->label ('Новый пароль')
36   - ->passwordInput (['value' => '']);
37   - echo $form->field ($user, 'password_reply', ['template' => "{input}{label}\n{hint}\n{error}"])
38   - ->label ('Повторите пароль')
39   - ->passwordInput (['value' => '']);
40   - echo Html::submitButton ('Обновить', ['class' => 'btn btn-primary']);
41   - $form->end ();
42 30 ?>
  31 + <div class="login-left-column-title-two style">Сменить пароль:</div>
  32 +<div class="input-blocks-wrapper">
  33 + <div class="input-blocks">
  34 + <?= $form->field ($user, 'old_password', ['template' => "{label}{input}\n{hint}\n{error}"])
  35 + ->label ('Старый пароль')
  36 + ->passwordInput (['value' => '','class'=>'custom-input-2']);
  37 + ?>
  38 + </div>
  39 +</div>
  40 +<div class="input-blocks-wrapper">
  41 + <div class="input-blocks">
  42 + <?= $form->field ($user, 'new_password', ['template' => "{label}{input}\n{hint}\n{error}"])
  43 + ->label ('Новый пароль')
  44 + ->passwordInput (['value' => '','class'=>'custom-input-2']);
  45 + ?>
  46 + </div>
  47 +</div>
  48 +<div class="input-blocks-wrapper">
  49 + <div class="input-blocks">
  50 + <?= $form->field ($user, 'password_reply', ['template' => "{label}{input}\n{hint}\n{error}"])
  51 + ->label ('Повторите пароль')
  52 + ->passwordInput (['value' => '','class'=>'custom-input-2']);
  53 + ?>
  54 + </div>
  55 +</div>
  56 +<div class="input-blocks-wrapper">
  57 + <div class="admin-save-btn skills-save-btn line-btn-fix style">
  58 + <?= Html::submitButton ('Обновить', ['class' => 'btn btn-primary']);
  59 + $form->end ();
  60 + ?>
  61 + </div>
  62 +</div>
43 63  
44 64  
... ...
frontend/web/css/style.css
  Show/Hide comments   View file @b274352
... ... @@ -5423,7 +5423,9 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last-
5423 5423 border-bottom: 1px dashed #0072bc;
5424 5424 padding: 0;
5425 5425 border-radius: 0;
5426   - line-height: 13px;
  5426 + line-height: 10px;
  5427 + margin-left: 193px;
  5428 + margin-top: 7px;
5427 5429 }
5428 5430 .skills-admin-wrapper .btn:focus, .skills-admin-wrapper .btn:active{
5429 5431 background: none;
... ... @@ -5447,11 +5449,47 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last-
5447 5449 .skills-admin-wrapper .glyphicon {
5448 5450 position: absolute;
5449 5451 top: 50%;
5450   - margin-top: -7px;
5451   - right: -18px;
  5452 + margin-top: -3px;
  5453 + left: 311px;
5452 5454 }
  5455 +
  5456 +.education-skills .glyphicon {top: 13px; margin-top: 0; margin-left: 105px}
5453 5457 .custom-input-2.custom-input-2-date {
5454 5458 width: 60px;
5455 5459 padding: 0;
5456 5460 padding-left: 12px;
5457   -}
5458 5461 \ No newline at end of file
  5462 +}
  5463 +.skills-admin-wrapper .input-blocks label{
  5464 + float: left;
  5465 + height: 29px;
  5466 + line-height: 29px;
  5467 + cursor: pointer;
  5468 + margin-top: 5px;
  5469 + margin-left: 11px;
  5470 +}
  5471 +.skills-admin-wrapper .input-blocks input {float: left}
  5472 +.skills-admin-wrapper .form-group{position: relative; float: left}
  5473 +.skills-add-wr .input-blocks{
  5474 + width: 100%;
  5475 +}
  5476 +
  5477 +.skills-add-wr .form-group{margin-top: 20px}
  5478 +.skills-add-wr .form-group:first-child{margin-top: 5px}
  5479 +
  5480 +.skills-add-wr .form-group:first-child .input-blocks{margin-top: 5px}
  5481 +.skills-add-wr .form-group .input-blocks{margin-top: 5px}
  5482 +.skills-add-wr .form-group:first-child .input-blocks:first-child{margin-top: 0}
  5483 +.skills-programs .input-blocks input {margin-top: 10px}
  5484 +.skills-programs .input-blocks .form-group:first-child input {margin-top: 5px}
  5485 +.skills-save-btn {
  5486 + border-top: 1px solid #dbdbdb;
  5487 + padding-top: 28px;
  5488 + margin-top: 19px;
  5489 +}
  5490 +.login-left-column-title-two {
  5491 + font-size: 18px;
  5492 + margin-top: 28px;
  5493 +}
  5494 +.line-btn-fix button{line-height: normal !important;}
  5495 +a.blog-new-link{font-size: 18px !important; color: inherit !important; text-decoration: none!important;}
  5496 +a.blog-new-link:hover{text-decoration: underline !important;}
5459 5497 \ No newline at end of file
... ...