'btn btn-success' ]) ?>
- ['class'=>'style admin-all-pages-wr'],
- 'dataProvider' => $dataProvider,
- 'filterModel' => $searchModel,
- 'columns' => [
- [
- 'attribute' => 'project_id',
- 'label' => 'ID',
- ],
- 'name',
- [
- 'attribute' => 'date_add',
- 'filter' => "
+
+ ['class'=>'style admin-all-pages-wr'],
+ 'dataProvider' => $dataProvider,
+ 'filterModel' => $searchModel,
+ 'columns' => [
+ [
+ 'attribute' => 'project_id',
+ 'label' => 'ID',
+ ],
+ 'name',
+ [
+ 'attribute' => 'date_add',
+ 'filter' => "
', [
- 'projects-update',
- 'id' => $model->project_id,
- ],[
- 'title' => 'Редактировать',
- ]);
+ 'format' => 'html',
+ ],
+ [
+ 'attribute' => 'budget',
+ 'filter' => Html::activeInput('text', $searchModel, 'budget_approx', ['class'=>'form-control']),
+ 'value' => function($model, $key, $index, $column) {
+ /**
+ * @var Project $model
+ */
+ if($model->contractual) {
+ return 'Договорной';
+ } elseif(empty($model->budget)) {
+ return 'Не задано';
+ } else {
+ return $model->budget;
+ }
},
- 'delete' => function($url, $model, $key) {
- return Html::a('
', [
- 'projects-delete',
- 'id' => $model->project_id,
- ], [
- 'title' => Yii::t('app', 'delete'),
- 'aria-label' => Yii::t('app', 'delete'),
- 'data-confirm' => Yii::t('app', 'delete_confirm'),
- 'data-method' => 'post',
- 'data-pjax' => '0',
- ]);
+ 'label' => $searchModel->getAttributeLabel('budget').' +/- 10%',
+ ],
+ [
+ 'attribute' => 'contractual',
+ 'filter' => Html::activeDropDownList($searchModel, 'contractual',[1 => 'Только договорные', 2 => 'Без договорных'], ['prompt' => 'Все', 'class'=>'form-control']),
+ 'value' => function($model) {
+ return \Yii::$app->formatter->asBoolean($model->contractual);
+ }
+ ],
+ 'city',
+ [
+ 'attribute' => 'specializationString',
+ ],
+ 'view_count',
+ [
+ 'value' => function($model, $key, $index, $column) {
+ return count($model->comments);
},
+ 'label' => 'Отклики',
+ ],
+ [
+ 'class' => ActionColumn::className(),
+ 'buttons' => [
+ 'update' => function($url, $model, $key) {
+ return Html::a('', [
+ 'projects-update',
+ 'id' => $model->project_id,
+ ],[
+ 'title' => 'Редактировать',
+ ]);
+ },
+ 'delete' => function($url, $model, $key) {
+ return Html::a('', [
+ 'projects-delete',
+ 'id' => $model->project_id,
+ ], [
+ 'title' => Yii::t('app', 'delete'),
+ 'aria-label' => Yii::t('app', 'delete'),
+ 'data-confirm' => Yii::t('app', 'delete_confirm'),
+ 'data-method' => 'post',
+ 'data-pjax' => '0',
+ ]);
+ },
+ ],
+ 'template' => '{update} {delete}',
],
- 'template' => '{update} {delete}',
],
- ],
-]); ?>
+ ]); ?>
+
+
diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css
index 6ce2a9c..b48fc3c 100755
--- a/frontend/web/css/style.css
+++ b/frontend/web/css/style.css
@@ -2535,6 +2535,7 @@ input[type=file]::-webkit-file-upload-button {
appearance: none;
background-color: transparent;
margin-bottom: 16px;
+ padding-left: 8px;
}
.search-work-form select option:first-child{border-top: none}
@@ -5556,8 +5557,6 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last-
height: 34px;
line-height: 34px;
}
-
-
.login-left-column-title {border-bottom: 1px solid #dbdbdb; margin-top: 15px; padding-bottom: 27px;}
.login-left-column-title, .login-left-column-title h1{font-size: 18px}
.form-group{margin-bottom: 0}
@@ -6754,4 +6753,14 @@ input[disabled], select[disabled] {
right: 7px;
margin-top: -10px;
border-radius: 4px;
+}
+li.active-menu-admin .ico_num {
+ background: #0072BC;
+ color: #62b8ef;
+}
+li.active-menu-admin:hover a .ico_num {
+ color: #62b8ef !important;
+}
+#projectsearch-contractual {
+
}
\ No newline at end of file
--
libgit2 0.21.4
".
- DatePicker::widget([
- 'model' => $searchModel,
- 'attribute' => 'date_add_from',
- 'language' => 'ru',
- 'dateFormat' => 'yyyy-MM-dd',
- 'clientOptions' => [
- 'changeYear' => true,
- 'changeMonth' => true,
- ],
- ]).
- "
+ DatePicker::widget([
+ 'model' => $searchModel,
+ 'attribute' => 'date_add_from',
+ 'language' => 'ru',
+ 'dateFormat' => 'yyyy-MM-dd',
+ 'clientOptions' => [
+ 'changeYear' => true,
+ 'changeMonth' => true,
+ ],
+ ]).
+ "
".
- DatePicker::widget([
- 'model' => $searchModel,
- 'attribute' => 'date_add_to',
- 'language' => 'ru',
- 'dateFormat' => 'yyyy-MM-dd',
- 'clientOptions' => [
- 'changeYear' => true,
- 'changeMonth' => true,
- ],
- ])
- ."
+ DatePicker::widget([
+ 'model' => $searchModel,
+ 'attribute' => 'date_add_to',
+ 'language' => 'ru',
+ 'dateFormat' => 'yyyy-MM-dd',
+ 'clientOptions' => [
+ 'changeYear' => true,
+ 'changeMonth' => true,
+ ],
+ ])
+ ."
",
- 'format' => 'html',
- ],
- [
- 'attribute' => 'budget',
- 'filter' => Html::activeInput('text', $searchModel, 'budget_approx'),
- 'value' => function($model, $key, $index, $column) {
- /**
- * @var Project $model
- */
- if($model->contractual) {
- return 'Договорной';
- } elseif(empty($model->budget)) {
- return 'Не задано';
- } else {
- return $model->budget;
- }
- },
- 'label' => $searchModel->getAttributeLabel('budget').' +/- 10%',
- ],
- [
- 'attribute' => 'contractual',
- 'filter' => Html::activeDropDownList($searchModel, 'contractual', [1 => 'Только договорные', 2 => 'Без договорных'], ['prompt' => 'Все']),
- 'value' => function($model) {
- return \Yii::$app->formatter->asBoolean($model->contractual);
- }
- ],
- 'city',
- [
- 'attribute' => 'specializationString',
- ],
- 'view_count',
- [
- 'value' => function($model, $key, $index, $column) {
- return count($model->comments);
- },
- 'label' => 'Отклики',
- ],
- [
- 'class' => ActionColumn::className(),
- 'buttons' => [
- 'update' => function($url, $model, $key) {
- return Html::a('', [
- 'projects-update',
- 'id' => $model->project_id,
- ],[
- 'title' => 'Редактировать',
- ]);
+ 'format' => 'html',
+ ],
+ [
+ 'attribute' => 'budget',
+ 'filter' => Html::activeInput('text', $searchModel, 'budget_approx', ['class'=>'form-control']),
+ 'value' => function($model, $key, $index, $column) {
+ /**
+ * @var Project $model
+ */
+ if($model->contractual) {
+ return 'Договорной';
+ } elseif(empty($model->budget)) {
+ return 'Не задано';
+ } else {
+ return $model->budget;
+ }
},
- 'delete' => function($url, $model, $key) {
- return Html::a('', [
- 'projects-delete',
- 'id' => $model->project_id,
- ], [
- 'title' => Yii::t('app', 'delete'),
- 'aria-label' => Yii::t('app', 'delete'),
- 'data-confirm' => Yii::t('app', 'delete_confirm'),
- 'data-method' => 'post',
- 'data-pjax' => '0',
- ]);
+ 'label' => $searchModel->getAttributeLabel('budget').' +/- 10%',
+ ],
+ [
+ 'attribute' => 'contractual',
+ 'filter' => Html::activeDropDownList($searchModel, 'contractual',[1 => 'Только договорные', 2 => 'Без договорных'], ['prompt' => 'Все', 'class'=>'form-control']),
+ 'value' => function($model) {
+ return \Yii::$app->formatter->asBoolean($model->contractual);
+ }
+ ],
+ 'city',
+ [
+ 'attribute' => 'specializationString',
+ ],
+ 'view_count',
+ [
+ 'value' => function($model, $key, $index, $column) {
+ return count($model->comments);
},
+ 'label' => 'Отклики',
+ ],
+ [
+ 'class' => ActionColumn::className(),
+ 'buttons' => [
+ 'update' => function($url, $model, $key) {
+ return Html::a('', [
+ 'projects-update',
+ 'id' => $model->project_id,
+ ],[
+ 'title' => 'Редактировать',
+ ]);
+ },
+ 'delete' => function($url, $model, $key) {
+ return Html::a('', [
+ 'projects-delete',
+ 'id' => $model->project_id,
+ ], [
+ 'title' => Yii::t('app', 'delete'),
+ 'aria-label' => Yii::t('app', 'delete'),
+ 'data-confirm' => Yii::t('app', 'delete_confirm'),
+ 'data-method' => 'post',
+ 'data-pjax' => '0',
+ ]);
+ },
+ ],
+ 'template' => '{update} {delete}',
],
- 'template' => '{update} {delete}',
],
- ],
-]); ?>
+ ]); ?>
+