tokar commit

Виталий
1 parent 0f6274a7
Showing 3 changed files with 56 additions and 38 deletions Show diff stats
frontend/views/accounts/_job_form.php
frontend/views/accounts/employment.php
frontend/web/css/style.css
 <?php
-    /**
-     * @var integer $index
-     */
-    use common\models\Job;
-    use yii\helpers\Html;
-    use yii\jui\DatePicker;
-    use yii\widgets\ActiveForm;
+/**
+ * @var integer $index
+ */
+use common\models\Job;
+use yii\helpers\Html;
+use yii\jui\DatePicker;
+use yii\widgets\ActiveForm;
-    $model = new Job(['user_id' => \Yii::$app->user->getId (), 'current' => 0]);
-    $form = ActiveForm::begin ();
-    echo "<div class='ajax-loaded'><div class='prev_job_inputs'>";
-    echo $form->field ($model, '[' . $index . ']name')
-              ->label ('Название')
-              ->textInput ();
-    echo $form->field ($model, '[' . $index . ']link')
-              ->label ('Ссылка на компанию на сайте МФП')
-              ->textInput ();
-    echo $form->field ($model, '[' . $index . ']date_start')
-              ->label ('Дата начала работы')
-              ->widget (DatePicker::className (), ['language' => 'ru', 'dateFormat' => 'dd-MM-yyyy']);
-    echo $form->field ($model, '[' . $index . ']date_end')
-              ->label ('Дата окончания работы')
-              ->widget (DatePicker::className (), ['language' => 'ru', 'dateFormat' => 'dd-MM-yyyy']);
-    echo $form->field ($model, '[' . $index . ']position')
-              ->label ('Должность')
-              ->textInput ();
-    echo $form->field ($model, '[' . $index . ']total_count')
-              ->label ('Количество проектов, в которых принимали участие')
-              ->input ('number');
-    echo $form->field ($model, '[' . $index . ']complete_count')
-              ->label ('из них реализовано')
-              ->input ('number');
-    echo Html::button('Удалить', ['class' => 'remove_job_button']);
-    echo "</div></div>";
-    $form->end ();
+$model = new Job(['user_id' => \Yii::$app->user->getId (), 'current' => 0]);
+$form = ActiveForm::begin ();
 ?>
+<div class='ajax-loaded'><div class='prev_job_inputs'>
+        <?= $form->field ($model, '[' . $index . ']name')
+            ->label ('Название')
+            ->textInput ();
+        ?>
+        <?= $form->field ($model, '[' . $index . ']link')
+            ->label ('Ссылка на компанию на сайте МФП')
+            ->textInput ();
+        ?>
+        <?= $form->field ($model, '[' . $index . ']date_start')
+            ->label ('Дата начала работы')
+            ->widget (DatePicker::className (), ['language' => 'ru', 'dateFormat' => 'dd-MM-yyyy']);
+        ?>
+        <?= $form->field ($model, '[' . $index . ']date_end')
+            ->label ('Дата окончания работы')
+            ->widget (DatePicker::className (), ['language' => 'ru', 'dateFormat' => 'dd-MM-yyyy']);
+        ?>
+        <?= $form->field ($model, '[' . $index . ']position')
+            ->label ('Должность')
+            ->textInput ();
+        ?>
+        <?= $form->field ($model, '[' . $index . ']total_count')
+            ->label ('Количество проектов, в которых принимали участие')
+            ->input ('number');
+        ?>
+        <?= $form->field ($model, '[' . $index . ']complete_count')
+            ->label ('из них реализовано')
+            ->input ('number');
+        ?>
+        <?= Html::button('', ['class' => 'remove_job_button']);?>
+    </div></div>
+<?php $form->end (); ?>
@@ -6,7 +6,6 @@ use common\models\Job;
 use yii\helpers\Html;
 use yii\jui\DatePicker;
 use yii\widgets\ActiveForm;
-//HUUIISAODASIDSIA
 $this->title = 'Трудовой стаж';
 $this->params['breadcrumbs'][] = $this->title;
 ?>
@@ -47,9 +46,9 @@ $current = array_shift ($job);
         <div class="input-blocks-wrapper">
             <div class="input-blocks">
-                <?= $form->field ($current, '[0]date_start')
+                <?= $form->field ($current, '[0]date_start', ['options' => ['class' => 'test2class']])
                     ->label ('Дата начала работы')
-                    ->widget (DatePicker::className (), ['language' => 'ru', 'dateFormat' => 'dd-MM-yyyy']);
+                    ->widget (DatePicker::className (), ['options' => ['class' => 'testclass'], 'language' => 'ru', 'dateFormat' => 'dd-MM-yyyy', 'clientOptions' => ['changeYear' => true, 'yearRange' => 'c-20:c', 'changeMonth' => true]]);
                 ?>
             </div>
         </div>
@@ -1087,6 +1087,8 @@ input[type=file]::-webkit-file-upload-button {
 .pagination li.dots-next:hover {
     border: 1px solid #fff;
 }
+.pagination li.disabled {display: none}
+.pagination li.prev a, .pagination li.next a {line-height: 28px!important;}
 /**************landingCompany**************/
 .section-box-5 {
@@ -5492,4 +5494,14 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last-
 }
 .line-btn-fix button{line-height: normal !important;}
 a.blog-new-link{font-size: 18px !important; color: inherit !important; text-decoration: none!important;}
-a.blog-new-link:hover{text-decoration: underline !important;}
 \ No newline at end of file
+a.blog-new-link:hover{text-decoration: underline !important;}
+.remove_job_button{
+    content: '' !important;
+    width: 13px;
+    height: 13px;
+    cursor: pointer;
+    background: url("/images/delete-ico.png") no-repeat;
+    display: block;
+    border: none;
+    outline: none;
+}
 \ No newline at end of file