Commit c6206ab62a0c3c43d5426cb99b4eaea76ffe2e16
1 parent
480297bb
git
Showing
4 changed files
with
230 additions
and
142 deletions
Show diff stats
frontend/views/accounts/participant-edit.php
| @@ -14,53 +14,129 @@ | @@ -14,53 +14,129 @@ | ||
| 14 | $this->params[ 'breadcrumbs' ][] = $this->title; | 14 | $this->params[ 'breadcrumbs' ][] = $this->title; |
| 15 | ?> | 15 | ?> |
| 16 | <div class="login-left-column-title"><?= $this->title ?></div> | 16 | <div class="login-left-column-title"><?= $this->title ?></div> |
| 17 | -<div> | ||
| 18 | - <p>Редактировать информацию о себе:</p> | 17 | +<div class="login-left-column-title-two style">Редактировать информацию о себе:</div> |
| 19 | <?php | 18 | <?php |
| 20 | - if($model->status != 1) { | ||
| 21 | - ?> | ||
| 22 | - <div class="alert alert-info" role="alert"> | ||
| 23 | - <strong>Внимание:</strong> данным действием Вы подтверждаете свое участие в проекте. | ||
| 24 | - </div> | ||
| 25 | - <?php | ||
| 26 | - } | 19 | + if($model->status != 1) { |
| 20 | + ?> | ||
| 21 | + <div class="alert alert-info" role="alert"> | ||
| 22 | + <strong>Внимание:</strong> данным действием Вы подтверждаете свое участие в проекте. | ||
| 23 | + </div> | ||
| 24 | + <?php | ||
| 25 | + } | ||
| 27 | ?> | 26 | ?> |
| 28 | - <div> | 27 | + |
| 29 | <?php | 28 | <?php |
| 30 | - $form = ActiveForm::begin(); | ||
| 31 | - echo $form->field($model, 'position') | ||
| 32 | - ->textInput(); | ||
| 33 | - echo $form->field($model, 'time') | ||
| 34 | - ->input('number'); | 29 | + $form = ActiveForm::begin(); |
| 35 | ?> | 30 | ?> |
| 36 | - </div> | ||
| 37 | - <p>Добавить фотографию в личный альбом данного проекта:</p> | ||
| 38 | - <?php | ||
| 39 | - if($model->status == 1 && !empty( $model->gallery )) { | ||
| 40 | - echo $form->field($model->portfolioGallery, 'caption') | ||
| 41 | - ->widget(CKEditor::className(), [ 'editorOptions' => [ 'preset' => 'basic' ] ]); | ||
| 42 | - echo Html::tag('div', ImageUploader::widget([ | ||
| 43 | - 'model' => $model->gallery, | ||
| 44 | - 'field' => 'photo', | ||
| 45 | - 'size' => [ | ||
| 46 | - [ | ||
| 47 | - 'width' => 152, | ||
| 48 | - 'height' => 108, | 31 | + <div class="input-blocks-wrapper"> |
| 32 | + <div class="input-blocks"> | ||
| 33 | + <?= $form->field($model, 'position') | ||
| 34 | + ->textInput([ 'class' => 'custom-input-2' ]); | ||
| 35 | + ?> | ||
| 36 | + </div> | ||
| 37 | + </div> | ||
| 38 | + | ||
| 39 | + <div class="input-blocks-wrapper"> | ||
| 40 | + <div class="input-blocks"> | ||
| 41 | + <?= | ||
| 42 | + $form->field($model, 'time') | ||
| 43 | + ->textInput([ | ||
| 44 | + 'class' => 'custom-input-2', | ||
| 45 | + 'type' => 'number', | ||
| 46 | + 'min' => 0, | ||
| 47 | + ]) | ||
| 48 | + ?> | ||
| 49 | + </div> | ||
| 50 | + </div> | ||
| 51 | + | ||
| 52 | + | ||
| 53 | + <div class="login-left-column-title-two style">Добавить фотографию в личный альбом данного проекта:</div> | ||
| 54 | + <div class="input-blocks-wrapper full-blocks admin-editor-bl"> | ||
| 55 | + <div class="input-blocks"> | ||
| 56 | + <?php | ||
| 57 | + if($model->status == 1 && !empty( $model->gallery )) { | ||
| 58 | + echo $form->field($model->portfolioGallery, 'caption') | ||
| 59 | + ->widget(CKEditor::className(), [ 'editorOptions' => [ 'preset' => 'basic' ] ]); | ||
| 60 | + echo Html::tag('div', ImageUploader::widget([ | ||
| 61 | + 'model' => $model->gallery, | ||
| 62 | + 'field' => 'photo', | ||
| 63 | + 'size' => [ | ||
| 64 | + [ | ||
| 65 | + 'width' => 152, | ||
| 66 | + 'height' => 108, | ||
| 67 | + ], | ||
| 49 | ], | 68 | ], |
| 50 | - ], | ||
| 51 | - 'multi' => true, | ||
| 52 | - 'gallery' => $model->gallery->photo, | ||
| 53 | - 'name' => 'Загрузить фото галереи', | ||
| 54 | - ]), [ 'class' => 'admin-gallery-photos-load-wr style' ]); | ||
| 55 | - } else { | ||
| 56 | - echo Html::tag('p', 'Для добавления фотографий Вы должны подтвердить свое участие'); | ||
| 57 | - } | ||
| 58 | - ?> | ||
| 59 | - <p class="text-right"> | 69 | + 'multi' => true, |
| 70 | + 'gallery' => $model->gallery->photo, | ||
| 71 | + 'name' => 'Загрузить фото галереи', | ||
| 72 | + ]), [ 'class' => 'admin-gallery-photos-load-wr style' ]); | ||
| 73 | + } else { | ||
| 74 | + echo Html::tag('p', 'Для добавления фотографий Вы должны подтвердить свое участие'); | ||
| 75 | + } | ||
| 76 | + ?> | ||
| 77 | + </div> | ||
| 78 | + </div> | ||
| 79 | + | ||
| 80 | + <div class="admin-save-btn skills-save-btn admin-add-remove-wr style"> | ||
| 81 | + <div class="admin-back-note"> | ||
| 82 | + <?= Html::a('Вернуться', [ 'accounts/participant' ]); ?> | ||
| 83 | + </div> | ||
| 84 | + | ||
| 85 | + <?= Html::submitButton('Обновить'); ?> | ||
| 60 | <?php | 86 | <?php |
| 61 | - echo Html::a('Вернуться', [ 'accounts/participant' ]); | ||
| 62 | - echo Html::submitButton('Обновить'); | ||
| 63 | - $form->end(); | 87 | + $form->end(); |
| 64 | ?> | 88 | ?> |
| 65 | - </p> | ||
| 66 | -</div> | ||
| 67 | \ No newline at end of file | 89 | \ No newline at end of file |
| 90 | + </div> | ||
| 91 | + | ||
| 92 | + | ||
| 93 | + | ||
| 94 | +<!--<div>--> | ||
| 95 | +<!-- <p>Редактировать информацию о себе:</p>--> | ||
| 96 | +<!-- --><?php | ||
| 97 | +// if($model->status != 1) { | ||
| 98 | +// ?> | ||
| 99 | +<!-- <div class="alert alert-info" role="alert">--> | ||
| 100 | +<!-- <strong>Внимание:</strong> данным действием Вы подтверждаете свое участие в проекте.--> | ||
| 101 | +<!-- </div>--> | ||
| 102 | +<!-- --><?php | ||
| 103 | +// } | ||
| 104 | +// ?> | ||
| 105 | +<!-- <div>--> | ||
| 106 | +<!-- --><?php | ||
| 107 | +// $form = ActiveForm::begin(); | ||
| 108 | +// echo $form->field($model, 'position') | ||
| 109 | +// ->textInput(); | ||
| 110 | +// echo $form->field($model, 'time') | ||
| 111 | +// ->input('number'); | ||
| 112 | +// ?> | ||
| 113 | +<!-- </div>--> | ||
| 114 | +<!-- <p>Добавить фотографию в личный альбом данного проекта:</p>--> | ||
| 115 | +<!-- --><?php | ||
| 116 | +// if($model->status == 1 && !empty( $model->gallery )) { | ||
| 117 | +// echo $form->field($model->portfolioGallery, 'caption') | ||
| 118 | +// ->widget(CKEditor::className(), [ 'editorOptions' => [ 'preset' => 'basic' ] ]); | ||
| 119 | +// echo Html::tag('div', ImageUploader::widget([ | ||
| 120 | +// 'model' => $model->gallery, | ||
| 121 | +// 'field' => 'photo', | ||
| 122 | +// 'size' => [ | ||
| 123 | +// [ | ||
| 124 | +// 'width' => 152, | ||
| 125 | +// 'height' => 108, | ||
| 126 | +// ], | ||
| 127 | +// ], | ||
| 128 | +// 'multi' => true, | ||
| 129 | +// 'gallery' => $model->gallery->photo, | ||
| 130 | +// 'name' => 'Загрузить фото галереи', | ||
| 131 | +// ]), [ 'class' => 'admin-gallery-photos-load-wr style' ]); | ||
| 132 | +// } else { | ||
| 133 | +// echo Html::tag('p', 'Для добавления фотографий Вы должны подтвердить свое участие'); | ||
| 134 | +// } | ||
| 135 | +// ?> | ||
| 136 | +<!-- <p class="text-right">--> | ||
| 137 | +<!-- --><?php | ||
| 138 | +// echo Html::a('Вернуться', [ 'accounts/participant' ]); | ||
| 139 | +// echo Html::submitButton('Обновить'); | ||
| 140 | +// $form->end(); | ||
| 141 | +// ?> | ||
| 142 | +<!-- </p>--> | ||
| 143 | +<!--</div>--> | ||
| 68 | \ No newline at end of file | 144 | \ No newline at end of file |
frontend/views/accounts/participant.php
| @@ -16,7 +16,7 @@ | @@ -16,7 +16,7 @@ | ||
| 16 | $this->title = 'Портфолио участник'; | 16 | $this->title = 'Портфолио участник'; |
| 17 | $this->params[ 'breadcrumbs' ][] = $this->title; | 17 | $this->params[ 'breadcrumbs' ][] = $this->title; |
| 18 | ?> | 18 | ?> |
| 19 | -<div class="login-left-column-title"><?= $this->title ?></div> | 19 | +<div class="login-left-column-title fix"><?= $this->title ?></div> |
| 20 | <div class="admin-table-portfolio"> | 20 | <div class="admin-table-portfolio"> |
| 21 | <?= GridView::widget([ | 21 | <?= GridView::widget([ |
| 22 | 'options' => [ 'class' => 'style admin-all-pages-wr' ], | 22 | 'options' => [ 'class' => 'style admin-all-pages-wr' ], |
frontend/views/accounts/projects.php
| @@ -19,109 +19,112 @@ | @@ -19,109 +19,112 @@ | ||
| 19 | <div class="admin-all-pages-add"> | 19 | <div class="admin-all-pages-add"> |
| 20 | <?= Html::a(Yii::t('app', 'add'), [ 'projects-create' ], [ 'class' => 'btn btn-success' ]) ?> | 20 | <?= Html::a(Yii::t('app', 'add'), [ 'projects-create' ], [ 'class' => 'btn btn-success' ]) ?> |
| 21 | </div> | 21 | </div> |
| 22 | -<?= GridView::widget([ | ||
| 23 | - 'options' => ['class'=>'style admin-all-pages-wr'], | ||
| 24 | - 'dataProvider' => $dataProvider, | ||
| 25 | - 'filterModel' => $searchModel, | ||
| 26 | - 'columns' => [ | ||
| 27 | - [ | ||
| 28 | - 'attribute' => 'project_id', | ||
| 29 | - 'label' => 'ID', | ||
| 30 | - ], | ||
| 31 | - 'name', | ||
| 32 | - [ | ||
| 33 | - 'attribute' => 'date_add', | ||
| 34 | - 'filter' => "<div class=\"input-group input-group-xs input-daterange\"> | 22 | +<div class="admin-table-portfolio"> |
| 23 | + <?= GridView::widget([ | ||
| 24 | + 'options' => ['class'=>'style admin-all-pages-wr'], | ||
| 25 | + 'dataProvider' => $dataProvider, | ||
| 26 | + 'filterModel' => $searchModel, | ||
| 27 | + 'columns' => [ | ||
| 28 | + [ | ||
| 29 | + 'attribute' => 'project_id', | ||
| 30 | + 'label' => 'ID', | ||
| 31 | + ], | ||
| 32 | + 'name', | ||
| 33 | + [ | ||
| 34 | + 'attribute' => 'date_add', | ||
| 35 | + 'filter' => "<div class=\"input-group input-group-xs input-daterange\"> | ||
| 35 | <span class='field-teamsearch-experience_from_from'>". | 36 | <span class='field-teamsearch-experience_from_from'>". |
| 36 | - DatePicker::widget([ | ||
| 37 | - 'model' => $searchModel, | ||
| 38 | - 'attribute' => 'date_add_from', | ||
| 39 | - 'language' => 'ru', | ||
| 40 | - 'dateFormat' => 'yyyy-MM-dd', | ||
| 41 | - 'clientOptions' => [ | ||
| 42 | - 'changeYear' => true, | ||
| 43 | - 'changeMonth' => true, | ||
| 44 | - ], | ||
| 45 | - ]). | ||
| 46 | - "</span> | 37 | + DatePicker::widget([ |
| 38 | + 'model' => $searchModel, | ||
| 39 | + 'attribute' => 'date_add_from', | ||
| 40 | + 'language' => 'ru', | ||
| 41 | + 'dateFormat' => 'yyyy-MM-dd', | ||
| 42 | + 'clientOptions' => [ | ||
| 43 | + 'changeYear' => true, | ||
| 44 | + 'changeMonth' => true, | ||
| 45 | + ], | ||
| 46 | + ]). | ||
| 47 | + "</span> | ||
| 47 | <span class=\"input-group-addon kv-field-separator\"> | 48 | <span class=\"input-group-addon kv-field-separator\"> |
| 48 | <i class=\"glyphicon glyphicon-resize-horizontal\"></i> | 49 | <i class=\"glyphicon glyphicon-resize-horizontal\"></i> |
| 49 | </span> | 50 | </span> |
| 50 | <span class='field-teamsearch-experience_from_to'>". | 51 | <span class='field-teamsearch-experience_from_to'>". |
| 51 | - DatePicker::widget([ | ||
| 52 | - 'model' => $searchModel, | ||
| 53 | - 'attribute' => 'date_add_to', | ||
| 54 | - 'language' => 'ru', | ||
| 55 | - 'dateFormat' => 'yyyy-MM-dd', | ||
| 56 | - 'clientOptions' => [ | ||
| 57 | - 'changeYear' => true, | ||
| 58 | - 'changeMonth' => true, | ||
| 59 | - ], | ||
| 60 | - ]) | ||
| 61 | - ."</span> | 52 | + DatePicker::widget([ |
| 53 | + 'model' => $searchModel, | ||
| 54 | + 'attribute' => 'date_add_to', | ||
| 55 | + 'language' => 'ru', | ||
| 56 | + 'dateFormat' => 'yyyy-MM-dd', | ||
| 57 | + 'clientOptions' => [ | ||
| 58 | + 'changeYear' => true, | ||
| 59 | + 'changeMonth' => true, | ||
| 60 | + ], | ||
| 61 | + ]) | ||
| 62 | + ."</span> | ||
| 62 | </div>", | 63 | </div>", |
| 63 | - 'format' => 'html', | ||
| 64 | - ], | ||
| 65 | - [ | ||
| 66 | - 'attribute' => 'budget', | ||
| 67 | - 'filter' => Html::activeInput('text', $searchModel, 'budget_approx'), | ||
| 68 | - 'value' => function($model, $key, $index, $column) { | ||
| 69 | - /** | ||
| 70 | - * @var Project $model | ||
| 71 | - */ | ||
| 72 | - if($model->contractual) { | ||
| 73 | - return 'Договорной'; | ||
| 74 | - } elseif(empty($model->budget)) { | ||
| 75 | - return 'Не задано'; | ||
| 76 | - } else { | ||
| 77 | - return $model->budget; | ||
| 78 | - } | ||
| 79 | - }, | ||
| 80 | - 'label' => $searchModel->getAttributeLabel('budget').' +/- 10%', | ||
| 81 | - ], | ||
| 82 | - [ | ||
| 83 | - 'attribute' => 'contractual', | ||
| 84 | - 'filter' => Html::activeDropDownList($searchModel, 'contractual', [1 => 'Только договорные', 2 => 'Без договорных'], ['prompt' => 'Все']), | ||
| 85 | - 'value' => function($model) { | ||
| 86 | - return \Yii::$app->formatter->asBoolean($model->contractual); | ||
| 87 | - } | ||
| 88 | - ], | ||
| 89 | - 'city', | ||
| 90 | - [ | ||
| 91 | - 'attribute' => 'specializationString', | ||
| 92 | - ], | ||
| 93 | - 'view_count', | ||
| 94 | - [ | ||
| 95 | - 'value' => function($model, $key, $index, $column) { | ||
| 96 | - return count($model->comments); | ||
| 97 | - }, | ||
| 98 | - 'label' => 'Отклики', | ||
| 99 | - ], | ||
| 100 | - [ | ||
| 101 | - 'class' => ActionColumn::className(), | ||
| 102 | - 'buttons' => [ | ||
| 103 | - 'update' => function($url, $model, $key) { | ||
| 104 | - return Html::a('<img src="/images/ico_pencil.png" alt="">', [ | ||
| 105 | - 'projects-update', | ||
| 106 | - 'id' => $model->project_id, | ||
| 107 | - ],[ | ||
| 108 | - 'title' => 'Редактировать', | ||
| 109 | - ]); | 64 | + 'format' => 'html', |
| 65 | + ], | ||
| 66 | + [ | ||
| 67 | + 'attribute' => 'budget', | ||
| 68 | + 'filter' => Html::activeInput('text', $searchModel, 'budget_approx', ['class'=>'form-control']), | ||
| 69 | + 'value' => function($model, $key, $index, $column) { | ||
| 70 | + /** | ||
| 71 | + * @var Project $model | ||
| 72 | + */ | ||
| 73 | + if($model->contractual) { | ||
| 74 | + return 'Договорной'; | ||
| 75 | + } elseif(empty($model->budget)) { | ||
| 76 | + return 'Не задано'; | ||
| 77 | + } else { | ||
| 78 | + return $model->budget; | ||
| 79 | + } | ||
| 110 | }, | 80 | }, |
| 111 | - 'delete' => function($url, $model, $key) { | ||
| 112 | - return Html::a('<img src="/images/delete-ico.png" alt="">', [ | ||
| 113 | - 'projects-delete', | ||
| 114 | - 'id' => $model->project_id, | ||
| 115 | - ], [ | ||
| 116 | - 'title' => Yii::t('app', 'delete'), | ||
| 117 | - 'aria-label' => Yii::t('app', 'delete'), | ||
| 118 | - 'data-confirm' => Yii::t('app', 'delete_confirm'), | ||
| 119 | - 'data-method' => 'post', | ||
| 120 | - 'data-pjax' => '0', | ||
| 121 | - ]); | 81 | + 'label' => $searchModel->getAttributeLabel('budget').' +/- 10%', |
| 82 | + ], | ||
| 83 | + [ | ||
| 84 | + 'attribute' => 'contractual', | ||
| 85 | + 'filter' => Html::activeDropDownList($searchModel, 'contractual',[1 => 'Только договорные', 2 => 'Без договорных'], ['prompt' => 'Все', 'class'=>'form-control']), | ||
| 86 | + 'value' => function($model) { | ||
| 87 | + return \Yii::$app->formatter->asBoolean($model->contractual); | ||
| 88 | + } | ||
| 89 | + ], | ||
| 90 | + 'city', | ||
| 91 | + [ | ||
| 92 | + 'attribute' => 'specializationString', | ||
| 93 | + ], | ||
| 94 | + 'view_count', | ||
| 95 | + [ | ||
| 96 | + 'value' => function($model, $key, $index, $column) { | ||
| 97 | + return count($model->comments); | ||
| 122 | }, | 98 | }, |
| 99 | + 'label' => 'Отклики', | ||
| 100 | + ], | ||
| 101 | + [ | ||
| 102 | + 'class' => ActionColumn::className(), | ||
| 103 | + 'buttons' => [ | ||
| 104 | + 'update' => function($url, $model, $key) { | ||
| 105 | + return Html::a('<img src="/images/ico_pencil.png" alt="">', [ | ||
| 106 | + 'projects-update', | ||
| 107 | + 'id' => $model->project_id, | ||
| 108 | + ],[ | ||
| 109 | + 'title' => 'Редактировать', | ||
| 110 | + ]); | ||
| 111 | + }, | ||
| 112 | + 'delete' => function($url, $model, $key) { | ||
| 113 | + return Html::a('<img src="/images/delete-ico.png" alt="">', [ | ||
| 114 | + 'projects-delete', | ||
| 115 | + 'id' => $model->project_id, | ||
| 116 | + ], [ | ||
| 117 | + 'title' => Yii::t('app', 'delete'), | ||
| 118 | + 'aria-label' => Yii::t('app', 'delete'), | ||
| 119 | + 'data-confirm' => Yii::t('app', 'delete_confirm'), | ||
| 120 | + 'data-method' => 'post', | ||
| 121 | + 'data-pjax' => '0', | ||
| 122 | + ]); | ||
| 123 | + }, | ||
| 124 | + ], | ||
| 125 | + 'template' => '{update} {delete}', | ||
| 123 | ], | 126 | ], |
| 124 | - 'template' => '{update} {delete}', | ||
| 125 | ], | 127 | ], |
| 126 | - ], | ||
| 127 | -]); ?> | 128 | + ]); ?> |
| 129 | +</div> | ||
| 130 | + |
frontend/web/css/style.css
| @@ -2535,6 +2535,7 @@ input[type=file]::-webkit-file-upload-button { | @@ -2535,6 +2535,7 @@ input[type=file]::-webkit-file-upload-button { | ||
| 2535 | appearance: none; | 2535 | appearance: none; |
| 2536 | background-color: transparent; | 2536 | background-color: transparent; |
| 2537 | margin-bottom: 16px; | 2537 | margin-bottom: 16px; |
| 2538 | + padding-left: 8px; | ||
| 2538 | } | 2539 | } |
| 2539 | 2540 | ||
| 2540 | .search-work-form select option:first-child{border-top: none} | 2541 | .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- | @@ -5556,8 +5557,6 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last- | ||
| 5556 | height: 34px; | 5557 | height: 34px; |
| 5557 | line-height: 34px; | 5558 | line-height: 34px; |
| 5558 | } | 5559 | } |
| 5559 | - | ||
| 5560 | - | ||
| 5561 | .login-left-column-title {border-bottom: 1px solid #dbdbdb; margin-top: 15px; padding-bottom: 27px;} | 5560 | .login-left-column-title {border-bottom: 1px solid #dbdbdb; margin-top: 15px; padding-bottom: 27px;} |
| 5562 | .login-left-column-title, .login-left-column-title h1{font-size: 18px} | 5561 | .login-left-column-title, .login-left-column-title h1{font-size: 18px} |
| 5563 | .form-group{margin-bottom: 0} | 5562 | .form-group{margin-bottom: 0} |
| @@ -6754,4 +6753,14 @@ input[disabled], select[disabled] { | @@ -6754,4 +6753,14 @@ input[disabled], select[disabled] { | ||
| 6754 | right: 7px; | 6753 | right: 7px; |
| 6755 | margin-top: -10px; | 6754 | margin-top: -10px; |
| 6756 | border-radius: 4px; | 6755 | border-radius: 4px; |
| 6756 | +} | ||
| 6757 | +li.active-menu-admin .ico_num { | ||
| 6758 | + background: #0072BC; | ||
| 6759 | + color: #62b8ef; | ||
| 6760 | +} | ||
| 6761 | +li.active-menu-admin:hover a .ico_num { | ||
| 6762 | + color: #62b8ef !important; | ||
| 6763 | +} | ||
| 6764 | +#projectsearch-contractual { | ||
| 6765 | + | ||
| 6757 | } | 6766 | } |
| 6758 | \ No newline at end of file | 6767 | \ No newline at end of file |