Commit 04b478b93659ac18c2073833a0681c6f26e17304
1 parent
93e3bd31
tokar commit
Showing
9 changed files
with
136 additions
and
52 deletions
Show diff stats
frontend/views/accounts/_blog_form.php
| @@ -67,9 +67,10 @@ use yii\helpers\Html; | @@ -67,9 +67,10 @@ use yii\helpers\Html; | ||
| 67 | </div> | 67 | </div> |
| 68 | 68 | ||
| 69 | <div class="input-blocks-wrapper"> | 69 | <div class="input-blocks-wrapper"> |
| 70 | - <div class="admin-save-btn skills-save-btn style"> | 70 | + <div class="admin-save-btn skills-save-btn admin-add-remove-wr style"> |
| 71 | <?= Html::submitButton($blog->isNewRecord?'Добавить':'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?> | 71 | <?= Html::submitButton($blog->isNewRecord?'Добавить':'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?> |
| 72 | - <?php | 72 | + <div class="admin-remove-note"> |
| 73 | + <?php | ||
| 73 | if(!$blog->isNewRecord) { | 74 | if(!$blog->isNewRecord) { |
| 74 | echo Html::a('Удалить', [ | 75 | echo Html::a('Удалить', [ |
| 75 | 'accounts/blog-delete', | 76 | 'accounts/blog-delete', |
| @@ -82,8 +83,12 @@ use yii\helpers\Html; | @@ -82,8 +83,12 @@ use yii\helpers\Html; | ||
| 82 | 'data-pjax' => 0, | 83 | 'data-pjax' => 0, |
| 83 | ]); | 84 | ]); |
| 84 | } | 85 | } |
| 85 | - ?> | ||
| 86 | - <?= Html::a('Отменить', [ 'accounts/blog' ]) ?> | 86 | + ?> |
| 87 | + </div> | ||
| 88 | + | ||
| 89 | + <div class="admin-back-note"> | ||
| 90 | + <?= Html::a('вернуться', [ 'accounts/blog' ]) ?> | ||
| 91 | + </div> | ||
| 87 | </div> | 92 | </div> |
| 88 | </div> | 93 | </div> |
| 89 | 94 |
frontend/views/accounts/_gallery_form.php
| @@ -53,9 +53,10 @@ | @@ -53,9 +53,10 @@ | ||
| 53 | 53 | ||
| 54 | 54 | ||
| 55 | <div class="input-blocks-wrapper"> | 55 | <div class="input-blocks-wrapper"> |
| 56 | - <div class="admin-save-btn skills-save-btn style"> | 56 | + <div class="admin-save-btn skills-save-btn admin-add-remove-wr style"> |
| 57 | <?= Html::submitButton($gallery->isNewRecord?'Добавить':'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?> | 57 | <?= Html::submitButton($gallery->isNewRecord?'Добавить':'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?> |
| 58 | - <?php | 58 | + <div class="admin-remove-note"> |
| 59 | + <?php | ||
| 59 | if(!$gallery->isNewRecord) { | 60 | if(!$gallery->isNewRecord) { |
| 60 | echo Html::a('Удалить', [ | 61 | echo Html::a('Удалить', [ |
| 61 | 'accounts/gallery-delete', | 62 | 'accounts/gallery-delete', |
| @@ -68,8 +69,12 @@ | @@ -68,8 +69,12 @@ | ||
| 68 | 'data-pjax' => 0, | 69 | 'data-pjax' => 0, |
| 69 | ]); | 70 | ]); |
| 70 | } | 71 | } |
| 71 | - ?> | ||
| 72 | - <?= Html::a('Отменить', [ 'accounts/gallery' ]) ?> | 72 | + ?> |
| 73 | + </div> | ||
| 74 | + | ||
| 75 | + <div class="admin-back-note"> | ||
| 76 | + <?= Html::a('вернуться', [ 'accounts/gallery' ]) ?> | ||
| 77 | + </div> | ||
| 73 | </div> | 78 | </div> |
| 74 | </div> | 79 | </div> |
| 75 | 80 |
frontend/views/accounts/_portfolio_form.php
| @@ -146,9 +146,10 @@ use yii\web\JsExpression; | @@ -146,9 +146,10 @@ use yii\web\JsExpression; | ||
| 146 | </div> | 146 | </div> |
| 147 | 147 | ||
| 148 | <div class="input-blocks-wrapper"> | 148 | <div class="input-blocks-wrapper"> |
| 149 | - <div class="admin-save-btn skills-save-btn style"> | 149 | + <div class="admin-save-btn skills-save-btn admin-add-remove-wr style"> |
| 150 | <?= Html::submitButton($portfolio->isNewRecord?'Добавить':'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?> | 150 | <?= Html::submitButton($portfolio->isNewRecord?'Добавить':'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?> |
| 151 | - <?php | 151 | + <div class="admin-remove-note"> |
| 152 | + <?php | ||
| 152 | if(!$portfolio->isNewRecord) { | 153 | if(!$portfolio->isNewRecord) { |
| 153 | echo Html::a('Удалить', [ | 154 | echo Html::a('Удалить', [ |
| 154 | 'accounts/portfolio-delete', | 155 | 'accounts/portfolio-delete', |
| @@ -161,8 +162,12 @@ use yii\web\JsExpression; | @@ -161,8 +162,12 @@ use yii\web\JsExpression; | ||
| 161 | 'data-pjax' => 0, | 162 | 'data-pjax' => 0, |
| 162 | ]); | 163 | ]); |
| 163 | } | 164 | } |
| 164 | - ?> | ||
| 165 | - <?= Html::a('Отменить', [ 'accounts/portfolio' ]) ?> | 165 | + ?> |
| 166 | + </div> | ||
| 167 | + | ||
| 168 | + <div class="admin-back-note"> | ||
| 169 | + <?= Html::a('вернуться', [ 'accounts/portfolio' ]) ?> | ||
| 170 | + </div> | ||
| 166 | </div> | 171 | </div> |
| 167 | </div> | 172 | </div> |
| 168 | <?php | 173 | <?php |
frontend/views/accounts/_projects_form.php
| @@ -185,23 +185,27 @@ | @@ -185,23 +185,27 @@ | ||
| 185 | ]) ?> | 185 | ]) ?> |
| 186 | 186 | ||
| 187 | <div class="input-blocks-wrapper"> | 187 | <div class="input-blocks-wrapper"> |
| 188 | - <div class="admin-save-btn skills-save-btn style"> | 188 | + <div class="admin-save-btn skills-save-btn admin-add-remove-wr style"> |
| 189 | <?= Html::submitButton($project->isNewRecord?'Добавить':'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?> | 189 | <?= Html::submitButton($project->isNewRecord?'Добавить':'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?> |
| 190 | - <?php | ||
| 191 | - if(!$project->isNewRecord) { | ||
| 192 | - echo Html::a('Удалить', [ | ||
| 193 | - 'accounts/projects-delete', | ||
| 194 | - 'id' => $project->project_id, | ||
| 195 | - ], [ | ||
| 196 | - 'title' => 'Удалить', | ||
| 197 | - 'aria-label' => 'Удалить', | ||
| 198 | - 'data-confirm' => 'Вы уверены, что хотите удалить этот элемент?', | ||
| 199 | - 'data-method' => 'post', | ||
| 200 | - 'data-pjax' => 0, | ||
| 201 | - ]); | ||
| 202 | - } | ||
| 203 | - ?> | ||
| 204 | - <?= Html::a('Отменить', [ 'accounts/projects' ]) ?> | 190 | + <div class="admin-remove-note"> |
| 191 | + <?php | ||
| 192 | + if(!$project->isNewRecord) { | ||
| 193 | + echo Html::a('Удалить', [ | ||
| 194 | + 'accounts/projects-delete', | ||
| 195 | + 'id' => $project->project_id, | ||
| 196 | + ], [ | ||
| 197 | + 'title' => 'Удалить', | ||
| 198 | + 'aria-label' => 'Удалить', | ||
| 199 | + 'data-confirm' => 'Вы уверены, что хотите удалить этот элемент?', | ||
| 200 | + 'data-method' => 'post', | ||
| 201 | + 'data-pjax' => 0, | ||
| 202 | + ]); | ||
| 203 | + } | ||
| 204 | + ?> | ||
| 205 | + </div> | ||
| 206 | + <div class="admin-back-note"> | ||
| 207 | + <?= Html::a('вернуться', [ 'accounts/projects' ]) ?> | ||
| 208 | + </div> | ||
| 205 | </div> | 209 | </div> |
| 206 | </div> | 210 | </div> |
| 207 | 211 |
frontend/views/accounts/_team_form.php
| @@ -115,24 +115,27 @@ | @@ -115,24 +115,27 @@ | ||
| 115 | </div> | 115 | </div> |
| 116 | 116 | ||
| 117 | <div class="input-blocks-wrapper"> | 117 | <div class="input-blocks-wrapper"> |
| 118 | - <div class="admin-save-btn skills-save-btn style"> | 118 | + <div class="admin-save-btn skills-save-btn admin-add-remove-wr style"> |
| 119 | <?= Html::submitButton('Добавить', [ 'class' => 'input-blocks-wrapper button' ]) ?> | 119 | <?= Html::submitButton('Добавить', [ 'class' => 'input-blocks-wrapper button' ]) ?> |
| 120 | - <?php | ||
| 121 | - if(!$team->isNewRecord) { | ||
| 122 | - echo Html::a('Удалить', [ | ||
| 123 | - 'accounts/team-delete', | ||
| 124 | - 'id' => $team->team_id, | ||
| 125 | - ], [ | ||
| 126 | - 'title' => 'Удалить', | ||
| 127 | - 'aria-label' => 'Удалить', | ||
| 128 | - 'data-confirm' => 'Вы уверены, что хотите удалить этот элемент?', | ||
| 129 | - 'data-method' => 'post', | ||
| 130 | - 'data-pjax' => 0, | ||
| 131 | - 'class'=>'btn' | ||
| 132 | - ]); | ||
| 133 | - } | ||
| 134 | - ?> | ||
| 135 | - <?= Html::a('Отменить', [ 'accounts/team' ]) ?> | 120 | + <div class="admin-remove-note"> |
| 121 | + <?php | ||
| 122 | + if(!$team->isNewRecord) { | ||
| 123 | + echo Html::a('Удалить', [ | ||
| 124 | + 'accounts/team-delete', | ||
| 125 | + 'id' => $team->team_id, | ||
| 126 | + ], [ | ||
| 127 | + 'title' => 'Удалить', | ||
| 128 | + 'aria-label' => 'Удалить', | ||
| 129 | + 'data-confirm' => 'Вы уверены, что хотите удалить этот элемент?', | ||
| 130 | + 'data-method' => 'post', | ||
| 131 | + 'data-pjax' => 0, | ||
| 132 | + ]); | ||
| 133 | + } | ||
| 134 | + ?> | ||
| 135 | + </div> | ||
| 136 | + <div class="admin-back-note"> | ||
| 137 | + <?= Html::a('вернуться', [ 'accounts/team' ]) ?> | ||
| 138 | + </div> | ||
| 136 | </div> | 139 | </div> |
| 137 | </div> | 140 | </div> |
| 138 | 141 |
frontend/views/accounts/_vacancy_form.php
| @@ -173,9 +173,10 @@ | @@ -173,9 +173,10 @@ | ||
| 173 | </div> | 173 | </div> |
| 174 | </div> | 174 | </div> |
| 175 | 175 | ||
| 176 | -<div class="admin-save-btn skills-save-btn style"> | 176 | +<div class="admin-save-btn skills-save-btn admin-add-remove-wr style"> |
| 177 | <?= Html::submitButton($vacancy->isNewRecord?'Добавить':'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?> | 177 | <?= Html::submitButton($vacancy->isNewRecord?'Добавить':'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?> |
| 178 | - <?php | 178 | + <div class="admin-remove-note"> |
| 179 | + <?php | ||
| 179 | if(!$vacancy->isNewRecord) { | 180 | if(!$vacancy->isNewRecord) { |
| 180 | echo Html::a('Удалить', [ | 181 | echo Html::a('Удалить', [ |
| 181 | 'accounts/vacancy-delete', | 182 | 'accounts/vacancy-delete', |
| @@ -188,8 +189,11 @@ | @@ -188,8 +189,11 @@ | ||
| 188 | 'data-pjax' => 0, | 189 | 'data-pjax' => 0, |
| 189 | ]); | 190 | ]); |
| 190 | } | 191 | } |
| 191 | - ?> | ||
| 192 | - <?= Html::a('Отменить', [ 'accounts/vacancy' ]) ?> | 192 | + ?> |
| 193 | + </div> | ||
| 194 | + <div class="admin-back-note"> | ||
| 195 | + <?= Html::a('вернуться', [ 'accounts/vacancy' ]) ?> | ||
| 196 | + </div> | ||
| 193 | </div> | 197 | </div> |
| 194 | 198 | ||
| 195 | 199 |
frontend/views/accounts/gallery-video.php
| @@ -28,7 +28,7 @@ $this->params[ 'breadcrumbs' ][] = $this->title; | @@ -28,7 +28,7 @@ $this->params[ 'breadcrumbs' ][] = $this->title; | ||
| 28 | </div> | 28 | </div> |
| 29 | </div> | 29 | </div> |
| 30 | <div class="input-blocks-wrapper"> | 30 | <div class="input-blocks-wrapper"> |
| 31 | - <div class="admin-save-btn style"> | 31 | + <div class="admin-save-btn skills-save-btn style"> |
| 32 | <?= Html::submitButton('Сохранить') ?> | 32 | <?= Html::submitButton('Сохранить') ?> |
| 33 | </div> | 33 | </div> |
| 34 | </div> | 34 | </div> |
frontend/views/accounts/projects.php
| @@ -13,9 +13,9 @@ | @@ -13,9 +13,9 @@ | ||
| 13 | $this->params[ 'breadcrumbs' ][] = $this->title; | 13 | $this->params[ 'breadcrumbs' ][] = $this->title; |
| 14 | ?> | 14 | ?> |
| 15 | <div class="login-left-column-title"><?= $this->title ?></div> | 15 | <div class="login-left-column-title"><?= $this->title ?></div> |
| 16 | -<p> | 16 | +<div class="admin-all-pages-add"> |
| 17 | <?= Html::a(Yii::t('app', 'Добавить'), [ 'projects-create' ], [ 'class' => 'btn btn-success' ]) ?> | 17 | <?= Html::a(Yii::t('app', 'Добавить'), [ 'projects-create' ], [ 'class' => 'btn btn-success' ]) ?> |
| 18 | -</p> | 18 | +</div> |
| 19 | <?= GridView::widget([ | 19 | <?= GridView::widget([ |
| 20 | 'options' => ['class'=>'style admin-all-pages-wr'], | 20 | 'options' => ['class'=>'style admin-all-pages-wr'], |
| 21 | 'dataProvider' => $dataProvider, | 21 | 'dataProvider' => $dataProvider, |
frontend/web/css/style.css
| @@ -6092,4 +6092,62 @@ a {color: #0072bc} | @@ -6092,4 +6092,62 @@ a {color: #0072bc} | ||
| 6092 | input[disabled], select[disabled] { | 6092 | input[disabled], select[disabled] { |
| 6093 | cursor: default; | 6093 | cursor: default; |
| 6094 | background: #f1f1f1; | 6094 | background: #f1f1f1; |
| 6095 | +} | ||
| 6096 | +.admin-remove-note {float: right} | ||
| 6097 | +.admin-remove-note a{ | ||
| 6098 | + width: 160px; | ||
| 6099 | + height: 29px; | ||
| 6100 | + color: #D40000; | ||
| 6101 | + display: block; | ||
| 6102 | + border: 1px solid #D40000; | ||
| 6103 | + font-size: 13px; | ||
| 6104 | + line-height: 29px; | ||
| 6105 | + margin-top: 0; | ||
| 6106 | + outline: none; | ||
| 6107 | + border-radius: 4px; | ||
| 6108 | + text-decoration: none; | ||
| 6109 | +} | ||
| 6110 | + | ||
| 6111 | +.admin-remove-note a:hover{ | ||
| 6112 | + transition: 0.2s; | ||
| 6113 | + color: #fff; | ||
| 6114 | + background: #D40000; | ||
| 6115 | +} | ||
| 6116 | +.admin-remove-note a:focus { | ||
| 6117 | + background: #BB0202; | ||
| 6118 | + color: #fff; | ||
| 6119 | + border: 1px solid #BB0202; | ||
| 6120 | +} | ||
| 6121 | +.admin-back-note {float: left} | ||
| 6122 | +.admin-back-note a{ | ||
| 6123 | + height: 29px; | ||
| 6124 | + display: block; | ||
| 6125 | + font-size: 13px; | ||
| 6126 | + line-height: 29px; | ||
| 6127 | + margin-top: 0; | ||
| 6128 | + outline: none; | ||
| 6129 | + text-decoration: none; | ||
| 6130 | + float: left; | ||
| 6131 | + position: relative; | ||
| 6132 | + padding-left: 21px; | ||
| 6133 | +} | ||
| 6134 | +.admin-back-note a:before { | ||
| 6135 | + content: ''; | ||
| 6136 | + width: 11px; | ||
| 6137 | + height: 8px; | ||
| 6138 | + position: absolute; | ||
| 6139 | + left: 0; | ||
| 6140 | + top: 50%; | ||
| 6141 | + margin-top: -4px; | ||
| 6142 | + background: url("/images/arrow_back_01.png") no-repeat; | ||
| 6143 | +} | ||
| 6144 | +.admin-back-note a:hover { | ||
| 6145 | + text-decoration: underline; | ||
| 6146 | +} | ||
| 6147 | +.admin-back-note:hover a::before { | ||
| 6148 | + background: url("/images/arrow_back_01-hover.png") no-repeat; | ||
| 6149 | +} | ||
| 6150 | +.admin-add-remove-wr button{ | ||
| 6151 | + float: right; | ||
| 6152 | + margin-left: 10px; | ||
| 6095 | } | 6153 | } |
| 6096 | \ No newline at end of file | 6154 | \ No newline at end of file |