Commit c0e9e0fe58a4c0a9cba2aa59a3fa617cb6a85d4a
1 parent
f029862e
tokar commit
Showing
3 changed files
with
21 additions
and
9 deletions
Show diff stats
frontend/views/accounts/team.php
| @@ -12,11 +12,14 @@ | @@ -12,11 +12,14 @@ | ||
| 12 | $this->title = 'Команда'; | 12 | $this->title = 'Команда'; |
| 13 | $this->params[ 'breadcrumbs' ][] = $this->title; | 13 | $this->params[ 'breadcrumbs' ][] = $this->title; |
| 14 | ?> | 14 | ?> |
| 15 | -<h1><?= $this->title ?></h1> | ||
| 16 | -<p> | 15 | +<div class="login-left-column-title"><?= $this->title ?></div> |
| 16 | +<div class="admin-all-pages-add"> | ||
| 17 | <?= Html::a(Yii::t('app', 'Добавить'), [ 'team-create' ], [ 'class' => 'btn btn-success' ]) ?> | 17 | <?= Html::a(Yii::t('app', 'Добавить'), [ 'team-create' ], [ 'class' => 'btn btn-success' ]) ?> |
| 18 | -</p> | 18 | +</div> |
| 19 | + | ||
| 20 | + | ||
| 19 | <?= GridView::widget([ | 21 | <?= GridView::widget([ |
| 22 | + 'options' => ['class'=>'style admin-all-pages-wr'], | ||
| 20 | 'dataProvider' => $dataProvider, | 23 | 'dataProvider' => $dataProvider, |
| 21 | 'filterModel' => $searchModel, | 24 | 'filterModel' => $searchModel, |
| 22 | 'columns' => [ | 25 | 'columns' => [ |
| @@ -50,13 +53,13 @@ | @@ -50,13 +53,13 @@ | ||
| 50 | 'label' => 'Опыт, лет', | 53 | 'label' => 'Опыт, лет', |
| 51 | 'filter' => "<div class=\"input-group input-group-xs input-daterange\"> | 54 | 'filter' => "<div class=\"input-group input-group-xs input-daterange\"> |
| 52 | <span class='field-teamsearch-experience_from_from'> | 55 | <span class='field-teamsearch-experience_from_from'> |
| 53 | -<input type='number' id='teamsearch-experience_from_from' class='form-control' name='TeamSearch[experience_from_from]' value='" . \Yii::$app->request->get('TeamSearch')['experience_from_from'] . "' style='width:auto' min='0' max='" . \Yii::$app->request->get('TeamSearch')['experience_from_to'] . "'> | 56 | +<input type='number' id='teamsearch-experience_from_from' class='form-control' name='TeamSearch[experience_from_from]' value='" . \Yii::$app->request->get('TeamSearch')['experience_from_from'] . "' min='0' max='" . \Yii::$app->request->get('TeamSearch')['experience_from_to'] . "'> |
| 54 | </span> | 57 | </span> |
| 55 | <span class=\"input-group-addon kv-field-separator\"> | 58 | <span class=\"input-group-addon kv-field-separator\"> |
| 56 | <i class=\"glyphicon glyphicon-resize-horizontal\"></i> | 59 | <i class=\"glyphicon glyphicon-resize-horizontal\"></i> |
| 57 | </span> | 60 | </span> |
| 58 | <span class='field-teamsearch-experience_from_to'> | 61 | <span class='field-teamsearch-experience_from_to'> |
| 59 | -<input type='number' id='teamsearch-experience_from_to' class='form-control' name='TeamSearch[experience_from_to]' value='" . \Yii::$app->request->get('TeamSearch')['experience_from_to'] . "' style='width:auto' min='" . \Yii::$app->request->get('TeamSearch')['experience_from_from'] . "' max='100'> | 62 | +<input type='number' id='teamsearch-experience_from_to' class='form-control' name='TeamSearch[experience_from_to]' value='" . \Yii::$app->request->get('TeamSearch')['experience_from_to'] . "' min='" . \Yii::$app->request->get('TeamSearch')['experience_from_from'] . "' max='100'> |
| 60 | </span> | 63 | </span> |
| 61 | </div>", | 64 | </div>", |
| 62 | ], | 65 | ], |
| @@ -67,10 +70,14 @@ | @@ -67,10 +70,14 @@ | ||
| 67 | 'class' => 'yii\grid\ActionColumn', | 70 | 'class' => 'yii\grid\ActionColumn', |
| 68 | 'buttons' => [ | 71 | 'buttons' => [ |
| 69 | 'update' => function($url, $model, $key) { | 72 | 'update' => function($url, $model, $key) { |
| 70 | - return Html::a('Update', ['team-update', 'id' => $model->team_id]); | 73 | + return Html::a('<img src="/images/ico_pencil.png" alt="">', [ |
| 74 | + 'team-update', 'id' => $model->team_id | ||
| 75 | + ],[ | ||
| 76 | + 'title' => 'Редактировать', | ||
| 77 | + ]); | ||
| 71 | }, | 78 | }, |
| 72 | 'delete' => function($url, $model, $key) { | 79 | 'delete' => function($url, $model, $key) { |
| 73 | - return Html::a('Delete', ['team-delete', 'id' => $model->team_id], [ | 80 | + return Html::a('<img src="/images/delete-ico.png" alt="">', ['team-delete', 'id' => $model->team_id], [ |
| 74 | 'title' => 'Удалить', | 81 | 'title' => 'Удалить', |
| 75 | 'aria-label' => 'Удалить', | 82 | 'aria-label' => 'Удалить', |
| 76 | 'data-confirm' => 'Вы уверены, что хотите удалить этот элемент?', | 83 | 'data-confirm' => 'Вы уверены, что хотите удалить этот элемент?', |
frontend/views/accounts/vacancy.php
| @@ -31,7 +31,11 @@ | @@ -31,7 +31,11 @@ | ||
| 31 | 'class' => ActionColumn::className(), | 31 | 'class' => ActionColumn::className(), |
| 32 | 'buttons' => [ | 32 | 'buttons' => [ |
| 33 | 'update' => function($url, $model, $key) { | 33 | 'update' => function($url, $model, $key) { |
| 34 | - return Html::a('<img src="/images/ico_pencil.png" alt="">', ['vacancy-update', 'id' => $model->vacancy_id]); | 34 | + return Html::a('<img src="/images/ico_pencil.png" alt="">', |
| 35 | + ['vacancy-update', 'id' => $model->vacancy_id | ||
| 36 | + ],[ | ||
| 37 | + 'title' => 'Редактировать', | ||
| 38 | + ]); | ||
| 35 | }, | 39 | }, |
| 36 | 'delete' => function($url, $model, $key) { | 40 | 'delete' => function($url, $model, $key) { |
| 37 | return Html::a('<img src="/images/delete-ico.png" alt="">', ['vacancy-delete', 'id' => $model->vacancy_id], [ | 41 | return Html::a('<img src="/images/delete-ico.png" alt="">', ['vacancy-delete', 'id' => $model->vacancy_id], [ |
frontend/web/css/style.css
| @@ -5640,9 +5640,10 @@ a {color: #0072bc} | @@ -5640,9 +5640,10 @@ a {color: #0072bc} | ||
| 5640 | .admin-all-pages-wr table tbody tr td {padding: 4px 8px; vertical-align: middle} | 5640 | .admin-all-pages-wr table tbody tr td {padding: 4px 8px; vertical-align: middle} |
| 5641 | .admin-all-pages-wr table {font-size: 13px} | 5641 | .admin-all-pages-wr table {font-size: 13px} |
| 5642 | .admin-all-pages-wr table > thead > tr > th {vertical-align: middle} | 5642 | .admin-all-pages-wr table > thead > tr > th {vertical-align: middle} |
| 5643 | -.admin-all-pages-wr table tr td:last-child{width: 52px; padding: 0 8px} | 5643 | +.admin-all-pages-wr table tr td:last-child{min-width: 52px; padding: 0 8px} |
| 5644 | .admin-all-pages-wr table tr td:last-child a{margin-left: 5px} | 5644 | .admin-all-pages-wr table tr td:last-child a{margin-left: 5px} |
| 5645 | .admin-all-pages-wr table tr td:last-child a:first-child{margin-left: 0} | 5645 | .admin-all-pages-wr table tr td:last-child a:first-child{margin-left: 0} |
| 5646 | +.admin-all-pages-wr table tr td:first-child {min-width: 61px} | ||
| 5646 | .admin-all-pages-wr table .empty{font-size: 15px; margin: 10px 0} | 5647 | .admin-all-pages-wr table .empty{font-size: 15px; margin: 10px 0} |
| 5647 | .admin-all-pages-wr .pagination {float: right} | 5648 | .admin-all-pages-wr .pagination {float: right} |
| 5648 | .admin-all-pages-wr .pagination > li > a, .pagination > li > span { | 5649 | .admin-all-pages-wr .pagination > li > a, .pagination > li > span { |