Commit 6082d2a54d888188cbb08c0c98f8e2dbc209e4bc
1 parent
b82db04a
tokar commit
Showing
3 changed files
with
90 additions
and
87 deletions
Show diff stats
frontend/views/accounts/projects.php
| @@ -17,86 +17,89 @@ | @@ -17,86 +17,89 @@ | ||
| 17 | <div class="admin-all-pages-add"> | 17 | <div class="admin-all-pages-add"> |
| 18 | <?= Html::a(Yii::t('app', 'Добавить'), [ 'projects-create' ], [ 'class' => 'btn btn-success' ]) ?> | 18 | <?= Html::a(Yii::t('app', 'Добавить'), [ 'projects-create' ], [ 'class' => 'btn btn-success' ]) ?> |
| 19 | </div> | 19 | </div> |
| 20 | -<?= GridView::widget([ | ||
| 21 | - 'options' => ['class'=>'style admin-all-pages-wr'], | ||
| 22 | - 'dataProvider' => $dataProvider, | ||
| 23 | - 'filterModel' => $searchModel, | ||
| 24 | - 'columns' => [ | ||
| 25 | - [ | ||
| 26 | - 'attribute' => 'project_id', | ||
| 27 | - 'label' => 'ID', | ||
| 28 | - ], | ||
| 29 | - 'name', | ||
| 30 | - [ | ||
| 31 | - 'attribute' => 'date_add', | ||
| 32 | - 'filter' => "<div class=\"input-group input-group-xs input-daterange\"> | 20 | +<div class="admin-table-portfolio admin-table-vacancy"> |
| 21 | + <?= GridView::widget([ | ||
| 22 | + 'options' => ['class'=>'style admin-all-pages-wr'], | ||
| 23 | + 'dataProvider' => $dataProvider, | ||
| 24 | + 'filterModel' => $searchModel, | ||
| 25 | + 'columns' => [ | ||
| 26 | + [ | ||
| 27 | + 'attribute' => 'project_id', | ||
| 28 | + 'label' => 'ID', | ||
| 29 | + ], | ||
| 30 | + 'name', | ||
| 31 | + [ | ||
| 32 | + 'attribute' => 'date_add', | ||
| 33 | + 'filter' => "<div class=\"input-group input-group-xs input-daterange\"> | ||
| 33 | <span class='field-teamsearch-experience_from_from'>". | 34 | <span class='field-teamsearch-experience_from_from'>". |
| 34 | - DatePicker::widget([ | ||
| 35 | - 'model' => $searchModel, | ||
| 36 | - 'attribute' => 'date_add_from', | ||
| 37 | - 'language' => 'ru', | ||
| 38 | - 'dateFormat' => 'yyyy-MM-dd', | ||
| 39 | - 'clientOptions' => [ | ||
| 40 | - 'changeYear' => true, | ||
| 41 | - 'changeMonth' => true, | ||
| 42 | - ], | ||
| 43 | - ]). | ||
| 44 | - "</span> | 35 | + DatePicker::widget([ |
| 36 | + 'model' => $searchModel, | ||
| 37 | + 'attribute' => 'date_add_from', | ||
| 38 | + 'language' => 'ru', | ||
| 39 | + 'dateFormat' => 'yyyy-MM-dd', | ||
| 40 | + 'clientOptions' => [ | ||
| 41 | + 'changeYear' => true, | ||
| 42 | + 'changeMonth' => true, | ||
| 43 | + ], | ||
| 44 | + ]). | ||
| 45 | + "</span> | ||
| 45 | <span class=\"input-group-addon kv-field-separator\"> | 46 | <span class=\"input-group-addon kv-field-separator\"> |
| 46 | <i class=\"glyphicon glyphicon-resize-horizontal\"></i> | 47 | <i class=\"glyphicon glyphicon-resize-horizontal\"></i> |
| 47 | </span> | 48 | </span> |
| 48 | <span class='field-teamsearch-experience_from_to'>". | 49 | <span class='field-teamsearch-experience_from_to'>". |
| 49 | - DatePicker::widget([ | ||
| 50 | - 'model' => $searchModel, | ||
| 51 | - 'attribute' => 'date_add_to', | ||
| 52 | - 'language' => 'ru', | ||
| 53 | - 'dateFormat' => 'yyyy-MM-dd', | ||
| 54 | - 'clientOptions' => [ | ||
| 55 | - 'changeYear' => true, | ||
| 56 | - 'changeMonth' => true, | ||
| 57 | - ], | ||
| 58 | - ]) | ||
| 59 | - ."</span> | 50 | + DatePicker::widget([ |
| 51 | + 'model' => $searchModel, | ||
| 52 | + 'attribute' => 'date_add_to', | ||
| 53 | + 'language' => 'ru', | ||
| 54 | + 'dateFormat' => 'yyyy-MM-dd', | ||
| 55 | + 'clientOptions' => [ | ||
| 56 | + 'changeYear' => true, | ||
| 57 | + 'changeMonth' => true, | ||
| 58 | + ], | ||
| 59 | + ]) | ||
| 60 | + ."</span> | ||
| 60 | </div>", | 61 | </div>", |
| 61 | - 'format' => 'html', | ||
| 62 | - ], | ||
| 63 | - 'budget', | ||
| 64 | - 'city', | ||
| 65 | - [ | ||
| 66 | - 'attribute' => 'specializationString', | ||
| 67 | - ], | ||
| 68 | - 'view_count', | ||
| 69 | - [ | ||
| 70 | - 'value' => function($model, $key, $index, $column) { | ||
| 71 | - return 0; | ||
| 72 | - }, | ||
| 73 | - 'label' => 'Отклики', | ||
| 74 | - ], | ||
| 75 | - [ | ||
| 76 | - 'class' => ActionColumn::className(), | ||
| 77 | - 'buttons' => [ | ||
| 78 | - 'update' => function($url, $model, $key) { | ||
| 79 | - return Html::a('<img src="/images/ico_pencil.png" alt="">', [ | ||
| 80 | - 'projects-update', | ||
| 81 | - 'id' => $model->project_id, | ||
| 82 | - ],[ | ||
| 83 | - 'title' => 'Редактировать', | ||
| 84 | - ]); | ||
| 85 | - }, | ||
| 86 | - 'delete' => function($url, $model, $key) { | ||
| 87 | - return Html::a('<img src="/images/delete-ico.png" alt="">', [ | ||
| 88 | - 'projects-delete', | ||
| 89 | - 'id' => $model->project_id, | ||
| 90 | - ], [ | ||
| 91 | - 'title' => 'Удалить', | ||
| 92 | - 'aria-label' => 'Удалить', | ||
| 93 | - 'data-confirm' => 'Вы уверены, что хотите удалить этот элемент?', | ||
| 94 | - 'data-method' => 'post', | ||
| 95 | - 'data-pjax' => '0', | ||
| 96 | - ]); | 62 | + 'format' => 'html', |
| 63 | + ], | ||
| 64 | + 'budget', | ||
| 65 | + 'city', | ||
| 66 | + [ | ||
| 67 | + 'attribute' => 'specializationString', | ||
| 68 | + ], | ||
| 69 | + 'view_count', | ||
| 70 | + [ | ||
| 71 | + 'value' => function($model, $key, $index, $column) { | ||
| 72 | + return 0; | ||
| 97 | }, | 73 | }, |
| 74 | + 'label' => 'Отклики', | ||
| 75 | + ], | ||
| 76 | + [ | ||
| 77 | + 'class' => ActionColumn::className(), | ||
| 78 | + 'buttons' => [ | ||
| 79 | + 'update' => function($url, $model, $key) { | ||
| 80 | + return Html::a('<img src="/images/ico_pencil.png" alt="">', [ | ||
| 81 | + 'projects-update', | ||
| 82 | + 'id' => $model->project_id, | ||
| 83 | + ],[ | ||
| 84 | + 'title' => 'Редактировать', | ||
| 85 | + ]); | ||
| 86 | + }, | ||
| 87 | + 'delete' => function($url, $model, $key) { | ||
| 88 | + return Html::a('<img src="/images/delete-ico.png" alt="">', [ | ||
| 89 | + 'projects-delete', | ||
| 90 | + 'id' => $model->project_id, | ||
| 91 | + ], [ | ||
| 92 | + 'title' => 'Удалить', | ||
| 93 | + 'aria-label' => 'Удалить', | ||
| 94 | + 'data-confirm' => 'Вы уверены, что хотите удалить этот элемент?', | ||
| 95 | + 'data-method' => 'post', | ||
| 96 | + 'data-pjax' => '0', | ||
| 97 | + ]); | ||
| 98 | + }, | ||
| 99 | + ], | ||
| 100 | + 'template' => '{update} {delete}', | ||
| 98 | ], | 101 | ], |
| 99 | - 'template' => '{update} {delete}', | ||
| 100 | ], | 102 | ], |
| 101 | - ], | ||
| 102 | -]); ?> | 103 | + ]); ?> |
| 104 | +</div> | ||
| 105 | + |
frontend/views/layouts/main.php
| @@ -339,10 +339,10 @@ AppAsset::register($this); | @@ -339,10 +339,10 @@ AppAsset::register($this); | ||
| 339 | 'label' => 'Ad Choices', | 339 | 'label' => 'Ad Choices', |
| 340 | 'url' => [' '] | 340 | 'url' => [' '] |
| 341 | ], | 341 | ], |
| 342 | - [ | ||
| 343 | - 'label' => 'Еще', | ||
| 344 | - 'url' => [' '] | ||
| 345 | - ], | 342 | +// [ |
| 343 | +// 'label' => 'Еще', | ||
| 344 | +// 'url' => [' '] | ||
| 345 | +// ], | ||
| 346 | ] | 346 | ] |
| 347 | ]); | 347 | ]); |
| 348 | ?> | 348 | ?> |
frontend/views/search/project.php
| @@ -81,15 +81,15 @@ $this->title = 'My Yii Application'; | @@ -81,15 +81,15 @@ $this->title = 'My Yii Application'; | ||
| 81 | <div class="blocks-check-list"> | 81 | <div class="blocks-check-list"> |
| 82 | <input type="checkbox" name="group2" class="check-search" id="theme-4"><label for="theme-4"><span></span>Договорной</label> | 82 | <input type="checkbox" name="group2" class="check-search" id="theme-4"><label for="theme-4"><span></span>Договорной</label> |
| 83 | </div> | 83 | </div> |
| 84 | - <div class="blocks-check-list"> | ||
| 85 | - <input type="checkbox" name="group2" class="check-search" id="theme-5"><label for="theme-5"><span></span>Компании</label> | ||
| 86 | - </div> | ||
| 87 | - <div class="blocks-check-list"> | ||
| 88 | - <input type="checkbox" name="group2" class="check-search" id="theme-6"><label for="theme-6"><span></span>Проектанты</label> | ||
| 89 | - </div> | ||
| 90 | - <div class="blocks-check-list"> | ||
| 91 | - <input checked type="checkbox" name="group2" class="check-search" id="theme-7"><label for="theme-7"><span></span>Все</label> | ||
| 92 | - </div> | 84 | +<!-- <div class="blocks-check-list">--> |
| 85 | +<!-- <input type="checkbox" name="group2" class="check-search" id="theme-5"><label for="theme-5"><span></span>Компании</label>--> | ||
| 86 | +<!-- </div>--> | ||
| 87 | +<!-- <div class="blocks-check-list">--> | ||
| 88 | +<!-- <input type="checkbox" name="group2" class="check-search" id="theme-6"><label for="theme-6"><span></span>Проектанты</label>--> | ||
| 89 | +<!-- </div>--> | ||
| 90 | +<!-- <div class="blocks-check-list">--> | ||
| 91 | +<!-- <input checked type="checkbox" name="group2" class="check-search" id="theme-7"><label for="theme-7"><span></span>Все</label>--> | ||
| 92 | +<!-- </div>--> | ||
| 93 | </div> | 93 | </div> |
| 94 | 94 | ||
| 95 | 95 |