From bdf3e3610202edf7420b7e0e2871d09280c92684 Mon Sep 17 00:00:00 2001 From: icemate Date: Fri, 12 Feb 2016 12:17:56 +0200 Subject: [PATCH] tokar commit --- frontend/views/accounts/_job_form.php | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------- frontend/views/accounts/employment.php | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------ frontend/web/css/style.css | 2 +- 3 files changed, 132 insertions(+), 65 deletions(-) diff --git a/frontend/views/accounts/_job_form.php b/frontend/views/accounts/_job_form.php index 0c6dd5b..29560f4 100755 --- a/frontend/views/accounts/_job_form.php +++ b/frontend/views/accounts/_job_form.php @@ -11,34 +11,65 @@ $model = new Job(['user_id' => \Yii::$app->user->getId (), 'current' => 0]); $form = ActiveForm::begin (); ?>
- field ($model, '[' . $index . ']name') - ->label ('Название') - ->textInput (); - ?> - field ($model, '[' . $index . ']link') - ->label ('Ссылка на компанию на сайте МФП') - ->textInput (); - ?> - field ($model, '[' . $index . ']date_start') - ->label ('Дата начала работы') - ->widget (DatePicker::className (), ['language' => 'ru', 'dateFormat' => 'dd-MM-yyyy']); - ?> - field ($model, '[' . $index . ']date_end') - ->label ('Дата окончания работы') - ->widget (DatePicker::className (), ['language' => 'ru', 'dateFormat' => 'dd-MM-yyyy']); - ?> - field ($model, '[' . $index . ']position') - ->label ('Должность') - ->textInput (); - ?> - field ($model, '[' . $index . ']total_count') - ->label ('Количество проектов, в которых принимали участие') - ->input ('number'); - ?> - field ($model, '[' . $index . ']complete_count') - ->label ('из них реализовано') - ->input ('number'); - ?> +
+
+ field ($model, '[' . $index . ']name') + ->label ('Название') + ->textInput (['class'=> 'custom-input-2']); + ?> +
+
+
+
+ field ($model, '[' . $index . ']link') + ->label ('Ссылка на компанию на сайте МФП') + ->textInput (['class'=> 'custom-input-2']); + ?> +
+
+
+
+ field ($model, '[' . $index . ']date_start') + ->label ('Дата начала работы') + ->widget (DatePicker::className (), ['options' => ['class' => 'custom-input-2'], 'language' => 'ru', 'dateFormat' => 'dd-MM-yyyy', 'clientOptions' => ['changeYear' => true, 'yearRange' => 'c-20:c', 'changeMonth' => true]]); + ?> +
+
+ +
+
+ field ($model, '[' . $index . ']date_end') + ->label ('Дата окончания работы') + ->widget (DatePicker::className (), ['options' => ['class' => 'custom-input-2'], 'language' => 'ru', 'dateFormat' => 'dd-MM-yyyy', 'clientOptions' => ['changeYear' => true, 'yearRange' => 'c-20:c', 'changeMonth' => true]]); + ?> +
+
+ +
+
+ field ($model, '[' . $index . ']position') + ->label ('Должность') + ->textInput (['class'=> 'custom-input-2']); + ?> +
+
+ +
+
+ field ($model, '[' . $index . ']total_count') + ->label ('Количество проектов, в которых принимали участие') + ->textInput (['class'=> 'custom-input-2 custom-input-2-date','type'=>'number']); + ?> + +
+ field ($model, '[' . $index . ']complete_count') + ->label ('из них реализовано') + ->textInput (['class'=> 'custom-input-2 custom-input-2-date','type'=>'number']); + ?> +
+
+
+ 'remove_job_button']);?>
end (); ?> diff --git a/frontend/views/accounts/employment.php b/frontend/views/accounts/employment.php index 4e57484..5631355 100755 --- a/frontend/views/accounts/employment.php +++ b/frontend/views/accounts/employment.php @@ -15,9 +15,9 @@ $this->params['breadcrumbs'][] = $this->title; $form = ActiveForm::begin (); $current = array_shift ($job); ?> -
+
-
+
field ($current, '[0]name') @@ -49,47 +49,57 @@ $current = array_shift ($job);
field ($current, '[0]date_start', ['options' => ['class' => 'test2class']]) ->label ('Дата начала работы') - ->widget (DatePicker::className (), ['options' => ['class' => 'testclass'], 'language' => 'ru', 'dateFormat' => 'dd-MM-yyyy', 'clientOptions' => ['changeYear' => true, 'yearRange' => 'c-20:c', 'changeMonth' => true]]); + ->widget (DatePicker::className (), ['options' => ['class' => 'custom-input-2'], 'language' => 'ru', 'dateFormat' => 'dd-MM-yyyy', 'clientOptions' => ['changeYear' => true, 'yearRange' => 'c-20:c', 'changeMonth' => true]]); ?>
-
+
field ($current, '[0]total_count') ->label ('Количество проектов, в которых принимали участие') - ->textInput (['class'=> 'custom-input-2','type'=>'number']); + ->textInput (['class'=> 'custom-input-2 custom-input-2-date','type'=>'number']); ?> +
+ field ($current, '[0]complete_count') + ->label ('из них реализовано') + ->textInput (['class'=> 'custom-input-2 custom-input-2-date','type'=>'number']); + ?> +
+ + +
+
+
- field ($current, '[0]complete_count') - ->label ('из них реализовано') - ->textInput (['class'=> 'custom-input-2','type'=>'number']); + field ($current, '[0]date_start') + ->label ('Когда начали заниматься проектированием') + ->textInput (['class'=> 'custom-input-2']); ?>
-
-
-

Предыдущие места работы

+
+ $job_model) { ?>
-
-
- field ($job_model, '['. ($index + 1) .']name') - ->label ('Название') - ->textInput (['class'=> 'custom-input-2']); - ?> -
-
+
+
+ field ($job_model, '['. ($index + 1) .']name') + ->label ('Название') + ->textInput (['class'=> 'custom-input-2']); + ?> +
+
@@ -102,7 +112,7 @@ $current = array_shift ($job);
- field ($current, '[0]date_start', ['options' => ['class' => 'test2class']]) + field ($current, '[0]date_start') ->label ('Дата начала работы') ->widget (DatePicker::className (), ['options' => ['class' => 'custom-input-2'], 'language' => 'ru', 'dateFormat' => 'dd-MM-yyyy', 'clientOptions' => ['changeYear' => true, 'yearRange' => 'c-20:c', 'changeMonth' => true]]); ?> @@ -113,7 +123,7 @@ $current = array_shift ($job);
field ($job_model, '['. ($index + 1) .']date_end') ->label ('Дата окончания работы') - ->widget (DatePicker::className (), ['language' => 'ru', 'dateFormat' => 'dd-MM-yyyy']); + ->widget (DatePicker::className (), ['options' => ['class' => 'custom-input-2'], 'language' => 'ru', 'dateFormat' => 'dd-MM-yyyy', 'clientOptions' => ['changeYear' => true, 'yearRange' => 'c-20:c', 'changeMonth' => true]]); ?>
@@ -127,32 +137,40 @@ $current = array_shift ($job);
-
+
field ($job_model, '['. ($index + 1) .']total_count') ->label ('Количество проектов, в которых принимали участие') - ->textInput (['class'=> 'custom-input-2','type'=>'number']); + ->textInput (['class'=> 'custom-input-2 custom-input-2-date','type'=>'number']); ?> -
-
- -
-
+
field ($job_model, '['. ($index + 1) .']complete_count') ->label ('из них реализовано') - ->textInput (['class'=> 'custom-input-2','type'=>'number']); + ->textInput (['class'=> 'custom-input-2 custom-input-2-date','type'=>'number']); ?>
+
- 'remove_job_button']) ?> -
+ 'remove_job_button']) ?> +
-
+
+ +
+ 'add_job_button', 'class' => 'btn']); + ?> +
+ + +
+
+ 'input-blocks-wrapper button']) ?> +
+
'add_job_button']); - echo Html::submitButton('Обновить'); - $form->end (); + $form->end (); ?> + + diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css index 2323753..7340258 100755 --- a/frontend/web/css/style.css +++ b/frontend/web/css/style.css @@ -5504,4 +5504,4 @@ a.blog-new-link:hover{text-decoration: underline !important;} display: block; border: none; outline: none; -} +} \ No newline at end of file -- libgit2 0.21.4