Commit 3a1bbfcc6e7a2c694daea22a22b01a7358c00cd7
1 parent
eda71814
test
Showing
9 changed files
with
107 additions
and
28 deletions
Show diff stats
common/models/Vacancy.php
frontend/views/accounts/_blog_form.php
| ... | ... | @@ -66,10 +66,24 @@ use yii\helpers\Html; |
| 66 | 66 | ?> |
| 67 | 67 | </div> |
| 68 | 68 | |
| 69 | -<div class="input-blocks-wrapper full-blocks" style="margin-top: 20px"> | |
| 70 | - <div class="admin-save-btn style"> | |
| 71 | - <?= Html::submitButton('Добавить', ['class' => 'input-blocks-wrapper button']) ?> | |
| 72 | - <?= Html::submitButton('Удалить', ['class' => ' remove input-blocks-wrapper button']) ?> | |
| 69 | +<div class="input-blocks-wrapper"> | |
| 70 | + <div class="admin-save-btn skills-save-btn style"> | |
| 71 | + <?= Html::submitButton($blog->isNewRecord?'Добавить':'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?> | |
| 72 | + <?php | |
| 73 | + if(!$blog->isNewRecord) { | |
| 74 | + echo Html::a('Удалить', [ | |
| 75 | + 'accounts/blog-delete', | |
| 76 | + 'id' => $blog->blog_id, | |
| 77 | + ], [ | |
| 78 | + 'title' => 'Удалить', | |
| 79 | + 'aria-label' => 'Удалить', | |
| 80 | + 'data-confirm' => 'Вы уверены, что хотите удалить этот элемент?', | |
| 81 | + 'data-method' => 'post', | |
| 82 | + 'data-pjax' => 0, | |
| 83 | + ]); | |
| 84 | + } | |
| 85 | + ?> | |
| 86 | + <?= Html::a('Отменить', [ 'accounts/blog' ]) ?> | |
| 73 | 87 | </div> |
| 74 | 88 | </div> |
| 75 | 89 | ... | ... |
frontend/views/accounts/_gallery_form.php
| ... | ... | @@ -53,8 +53,23 @@ |
| 53 | 53 | |
| 54 | 54 | |
| 55 | 55 | <div class="input-blocks-wrapper"> |
| 56 | - <div class="admin-save-btn skills-save-btn style"> | |
| 57 | - <?= Html::submitButton('Добавить',['class'=>'input-blocks-wrapper button']) ?> | |
| 56 | + <div class="admin-save-btn skills-save-btn style"> | |
| 57 | + <?= Html::submitButton($gallery->isNewRecord?'Добавить':'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?> | |
| 58 | + <?php | |
| 59 | + if(!$gallery->isNewRecord) { | |
| 60 | + echo Html::a('Удалить', [ | |
| 61 | + 'accounts/gallery-delete', | |
| 62 | + 'id' => $gallery->gallery_id, | |
| 63 | + ], [ | |
| 64 | + 'title' => 'Удалить', | |
| 65 | + 'aria-label' => 'Удалить', | |
| 66 | + 'data-confirm' => 'Вы уверены, что хотите удалить этот элемент?', | |
| 67 | + 'data-method' => 'post', | |
| 68 | + 'data-pjax' => 0, | |
| 69 | + ]); | |
| 70 | + } | |
| 71 | + ?> | |
| 72 | + <?= Html::a('Отменить', [ 'accounts/gallery' ]) ?> | |
| 58 | 73 | </div> |
| 59 | 74 | </div> |
| 60 | 75 | ... | ... |
frontend/views/accounts/_portfolio_form.php
| ... | ... | @@ -145,10 +145,24 @@ use yii\web\JsExpression; |
| 145 | 145 | |
| 146 | 146 | </div> |
| 147 | 147 | |
| 148 | -<div class="input-blocks-wrapper full-blocks"> | |
| 149 | - <div class="admin-save-btn style"> | |
| 150 | - <?= Html::submitButton('Добавить', ['class' => 'input-blocks-wrapper button']) ?> | |
| 151 | - <?= Html::submitButton('Удалить', ['class' => ' remove input-blocks-wrapper button']) ?> | |
| 148 | +<div class="input-blocks-wrapper"> | |
| 149 | + <div class="admin-save-btn skills-save-btn style"> | |
| 150 | + <?= Html::submitButton($portfolio->isNewRecord?'Добавить':'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?> | |
| 151 | + <?php | |
| 152 | + if(!$portfolio->isNewRecord) { | |
| 153 | + echo Html::a('Удалить', [ | |
| 154 | + 'accounts/portfolio-delete', | |
| 155 | + 'id' => $portfolio->portfolio_id, | |
| 156 | + ], [ | |
| 157 | + 'title' => 'Удалить', | |
| 158 | + 'aria-label' => 'Удалить', | |
| 159 | + 'data-confirm' => 'Вы уверены, что хотите удалить этот элемент?', | |
| 160 | + 'data-method' => 'post', | |
| 161 | + 'data-pjax' => 0, | |
| 162 | + ]); | |
| 163 | + } | |
| 164 | + ?> | |
| 165 | + <?= Html::a('Отменить', [ 'accounts/portfolio' ]) ?> | |
| 152 | 166 | </div> |
| 153 | 167 | </div> |
| 154 | 168 | <?php | ... | ... |
frontend/views/accounts/_projects_form.php
| ... | ... | @@ -167,7 +167,26 @@ |
| 167 | 167 | 3 => 'Месяц', |
| 168 | 168 | ]) ?> |
| 169 | 169 | |
| 170 | -<?= Html::submitButton('Добавить') ?> | |
| 170 | +<div class="input-blocks-wrapper"> | |
| 171 | + <div class="admin-save-btn skills-save-btn style"> | |
| 172 | + <?= Html::submitButton($project->isNewRecord?'Добавить':'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?> | |
| 173 | + <?php | |
| 174 | + if(!$project->isNewRecord) { | |
| 175 | + echo Html::a('Удалить', [ | |
| 176 | + 'accounts/projects-delete', | |
| 177 | + 'id' => $project->project_id, | |
| 178 | + ], [ | |
| 179 | + 'title' => 'Удалить', | |
| 180 | + 'aria-label' => 'Удалить', | |
| 181 | + 'data-confirm' => 'Вы уверены, что хотите удалить этот элемент?', | |
| 182 | + 'data-method' => 'post', | |
| 183 | + 'data-pjax' => 0, | |
| 184 | + ]); | |
| 185 | + } | |
| 186 | + ?> | |
| 187 | + <?= Html::a('Отменить', [ 'accounts/projects' ]) ?> | |
| 188 | + </div> | |
| 189 | +</div> | |
| 171 | 190 | |
| 172 | 191 | <?php |
| 173 | 192 | $form->end(); | ... | ... |
frontend/views/accounts/_team_form.php
| ... | ... | @@ -140,18 +140,15 @@ |
| 140 | 140 | $form->end(); |
| 141 | 141 | ?> |
| 142 | 142 | <script> |
| 143 | - $ (document) | |
| 144 | - .ready ( | |
| 145 | - function () | |
| 146 | - { | |
| 147 | - $ ('.input-blocks-wrapper.admn-select-company select') | |
| 148 | - .change ( | |
| 149 | - function () | |
| 150 | - { | |
| 151 | - $ (this) | |
| 152 | - .blur () | |
| 153 | - } | |
| 154 | - ) | |
| 155 | - } | |
| 156 | - ) | |
| 143 | + $(document).ready( | |
| 144 | + function() | |
| 145 | + { | |
| 146 | + $('.input-blocks-wrapper.admn-select-company select').change( | |
| 147 | + function() | |
| 148 | + { | |
| 149 | + $(this).blur() | |
| 150 | + } | |
| 151 | + ); | |
| 152 | + } | |
| 153 | + ) | |
| 157 | 154 | </script> | ... | ... |
frontend/views/accounts/_vacancy_form.php
| ... | ... | @@ -161,7 +161,22 @@ |
| 161 | 161 | </div> |
| 162 | 162 | |
| 163 | 163 | <div class="admin-save-btn skills-save-btn style"> |
| 164 | - <?= Html::submitButton('Добавить') ?> | |
| 164 | + <?= Html::submitButton($vacancy->isNewRecord?'Добавить':'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?> | |
| 165 | + <?php | |
| 166 | + if(!$vacancy->isNewRecord) { | |
| 167 | + echo Html::a('Удалить', [ | |
| 168 | + 'accounts/vacancy-delete', | |
| 169 | + 'id' => $vacancy->vacancy_id, | |
| 170 | + ], [ | |
| 171 | + 'title' => 'Удалить', | |
| 172 | + 'aria-label' => 'Удалить', | |
| 173 | + 'data-confirm' => 'Вы уверены, что хотите удалить этот элемент?', | |
| 174 | + 'data-method' => 'post', | |
| 175 | + 'data-pjax' => 0, | |
| 176 | + ]); | |
| 177 | + } | |
| 178 | + ?> | |
| 179 | + <?= Html::a('Отменить', [ 'accounts/vacancy' ]) ?> | |
| 165 | 180 | </div> |
| 166 | 181 | |
| 167 | 182 | ... | ... |
frontend/views/accounts/description.php
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 | |
| 28 | 28 | <div class="input-blocks-wrapper"> |
| 29 | 29 | <div class="admin-save-btn skills-save-btn style"> |
| 30 | - <?= Html::submitButton('Добавить', ['class' => 'input-blocks-wrapper button']) ?> | |
| 30 | + <?= Html::submitButton('Сохранить', ['class' => 'input-blocks-wrapper button']) ?> | |
| 31 | 31 | </div> |
| 32 | 32 | </div> |
| 33 | 33 | ... | ... |
frontend/views/accounts/general.php
| ... | ... | @@ -270,7 +270,7 @@ |
| 270 | 270 | |
| 271 | 271 | <div class="input-blocks-wrapper"> |
| 272 | 272 | <div class="admin-save-btn style"> |
| 273 | - <?= Html::submitButton('Обновить', ['class' => 'input-blocks-wrapper button']); | |
| 273 | + <?= Html::submitButton('Сохранить', ['class' => 'input-blocks-wrapper button']); | |
| 274 | 274 | $form->end (); |
| 275 | 275 | ?> |
| 276 | 276 | </div> | ... | ... |