Commit 82c2fa67d4e3e4ccdc1bb05e2ae9b51891f3ffb0
1 parent
2cee8b86
tokar commit
Showing
6 changed files
with
130 additions
and
85 deletions
Show diff stats
frontend/views/accounts/_portfolio_form.php
| @@ -43,7 +43,7 @@ | @@ -43,7 +43,7 @@ | ||
| 43 | </div> | 43 | </div> |
| 44 | </div> | 44 | </div> |
| 45 | 45 | ||
| 46 | - <div class="input-blocks-wrapper"> | 46 | + <div class="input-blocks-wrapper admin-menu-list"> |
| 47 | <ul class="content-menu-first"> | 47 | <ul class="content-menu-first"> |
| 48 | <?php foreach($specializations as $specialization): ?> | 48 | <?php foreach($specializations as $specialization): ?> |
| 49 | <li data-img="<?= $specialization->image ?>"> | 49 | <li data-img="<?= $specialization->image ?>"> |
| @@ -58,7 +58,7 @@ | @@ -58,7 +58,7 @@ | ||
| 58 | <?php foreach($child_first->children as $child_second): ?> | 58 | <?php foreach($child_first->children as $child_second): ?> |
| 59 | <?php if($child_first instanceof Specialization): ?> | 59 | <?php if($child_first instanceof Specialization): ?> |
| 60 | <li> | 60 | <li> |
| 61 | - <a href="#"> | 61 | + <a href="#" title="<?= $child_second->specialization_name ?>"> |
| 62 | <?= $form->field($portfolio, "specializationInput[{$child_second->specialization_id}]", [ | 62 | <?= $form->field($portfolio, "specializationInput[{$child_second->specialization_id}]", [ |
| 63 | 'template' => '{input}{label}{hint}{error}', | 63 | 'template' => '{input}{label}{hint}{error}', |
| 64 | ]) | 64 | ]) |
frontend/views/accounts/_projects_form.php
| @@ -46,7 +46,7 @@ | @@ -46,7 +46,7 @@ | ||
| 46 | ->dropDownList($projects, [ 'prompt' => 'Родительский проект' ]) ?> | 46 | ->dropDownList($projects, [ 'prompt' => 'Родительский проект' ]) ?> |
| 47 | </div> | 47 | </div> |
| 48 | </div> | 48 | </div> |
| 49 | -<div class="input-blocks-wrapper"> | 49 | +<div class="input-blocks-wrapper admin-menu-list"> |
| 50 | <ul class="content-menu-first"> | 50 | <ul class="content-menu-first"> |
| 51 | <?php foreach($specializations as $specialization):?> | 51 | <?php foreach($specializations as $specialization):?> |
| 52 | <li data-img="<?= $specialization->image?>"> | 52 | <li data-img="<?= $specialization->image?>"> |
| @@ -61,8 +61,17 @@ | @@ -61,8 +61,17 @@ | ||
| 61 | <?php foreach($child_first->children as $child_second):?> | 61 | <?php foreach($child_first->children as $child_second):?> |
| 62 | <?php if($child_first instanceof Specialization): ?> | 62 | <?php if($child_first instanceof Specialization): ?> |
| 63 | <li> | 63 | <li> |
| 64 | - <a href="#"> | ||
| 65 | - <?= $form->field($project, "specializationInput[{$child_second->specialization_id}]")->checkbox(['value' => $child_second->specialization_id, 'label' => $child_second->specialization_name, 'uncheck' => null,]) ?> | 64 | + <a href="#" title="<?= $child_second->specialization_name ?>"> |
| 65 | + <?= $form->field($project, "specializationInput[{$child_second->specialization_id}]", [ | ||
| 66 | + 'template' => '{input}{label}{hint}{error}', | ||
| 67 | + ]) | ||
| 68 | + ->label('<span></span>' . $child_second->specialization_name) | ||
| 69 | + ->checkbox([ | ||
| 70 | + 'value' => $child_second->specialization_id, | ||
| 71 | + 'label' => NULL, | ||
| 72 | + 'uncheck' => NULL, | ||
| 73 | + 'class' => 'custom-check', | ||
| 74 | + ], false) ?> | ||
| 66 | </a> | 75 | </a> |
| 67 | </li> | 76 | </li> |
| 68 | <?php endif;?> | 77 | <?php endif;?> |
frontend/views/accounts/_vacancy_form.php
| @@ -99,7 +99,7 @@ | @@ -99,7 +99,7 @@ | ||
| 99 | </div> | 99 | </div> |
| 100 | 100 | ||
| 101 | 101 | ||
| 102 | -<div class="input-blocks-wrapper"> | 102 | +<div class="input-blocks-wrapper admin-menu-list"> |
| 103 | <ul class="content-menu-first"> | 103 | <ul class="content-menu-first"> |
| 104 | <?php foreach($specializations as $specialization): ?> | 104 | <?php foreach($specializations as $specialization): ?> |
| 105 | <li data-img="<?= $specialization->image ?>"> | 105 | <li data-img="<?= $specialization->image ?>"> |
| @@ -114,13 +114,17 @@ | @@ -114,13 +114,17 @@ | ||
| 114 | <?php foreach($child_first->children as $child_second): ?> | 114 | <?php foreach($child_first->children as $child_second): ?> |
| 115 | <?php if($child_first instanceof Specialization): ?> | 115 | <?php if($child_first instanceof Specialization): ?> |
| 116 | <li> | 116 | <li> |
| 117 | - <a href="#"> | ||
| 118 | - <?= $form->field($vacancy, "specializationInput[{$child_second->specialization_id}]") | ||
| 119 | - ->checkbox([ | ||
| 120 | - 'value' => $child_second->specialization_id, | ||
| 121 | - 'label' => $child_second->specialization_name, | ||
| 122 | - 'uncheck' => NULL, | ||
| 123 | - ]) ?> | 117 | + <a href="#" title="<?= $child_second->specialization_name ?>"> |
| 118 | + <?= $form->field($vacancy, "specializationInput[{$child_second->specialization_id}]", [ | ||
| 119 | + 'template' => '{input}{label}{hint}{error}', | ||
| 120 | + ]) | ||
| 121 | + ->label('<span></span>' . $child_second->specialization_name) | ||
| 122 | + ->checkbox([ | ||
| 123 | + 'value' => $child_second->specialization_id, | ||
| 124 | + 'label' => NULL, | ||
| 125 | + 'uncheck' => NULL, | ||
| 126 | + 'class' => 'custom-check', | ||
| 127 | + ], false) ?> | ||
| 124 | </a> | 128 | </a> |
| 125 | </li> | 129 | </li> |
| 126 | <?php endif; ?> | 130 | <?php endif; ?> |
frontend/views/accounts/blog.php
| @@ -18,75 +18,79 @@ | @@ -18,75 +18,79 @@ | ||
| 18 | <div class="admin-all-pages-add"> | 18 | <div class="admin-all-pages-add"> |
| 19 | <?= Html::a(Yii::t('app', 'Добавить'), [ 'blog-create' ], [ 'class' => 'btn btn-success' ]) ?> | 19 | <?= Html::a(Yii::t('app', 'Добавить'), [ 'blog-create' ], [ 'class' => 'btn btn-success' ]) ?> |
| 20 | </div> | 20 | </div> |
| 21 | -<?= GridView::widget([ | ||
| 22 | - 'options' => ['class'=>'style admin-all-pages-wr'], | ||
| 23 | - 'dataProvider' => $dataProvider, | ||
| 24 | - 'filterModel' => $searchModel, | ||
| 25 | - 'columns' => [ | ||
| 26 | - [ | ||
| 27 | - 'attribute' => 'blog_id', | ||
| 28 | - 'label' => 'ID', | ||
| 29 | - ], | ||
| 30 | - 'name', | ||
| 31 | - [ | ||
| 32 | - 'attribute' => 'date_add', | ||
| 33 | - 'filter' => "<div class=\"input-group input-group-xs input-daterange\"> | 21 | + |
| 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' => 'blog_id', | ||
| 30 | + 'label' => 'ID', | ||
| 31 | + ], | ||
| 32 | + 'name', | ||
| 33 | + [ | ||
| 34 | + 'attribute' => 'date_add', | ||
| 35 | + 'filter' => "<div class=\"input-group input-group-xs input-daterange\"> | ||
| 34 | <span class='field-teamsearch-experience_from_from'>". | 36 | <span class='field-teamsearch-experience_from_from'>". |
| 35 | -DatePicker::widget([ | ||
| 36 | - 'model' => $searchModel, | ||
| 37 | - 'attribute' => 'date_add_from', | ||
| 38 | - 'language' => 'ru', | ||
| 39 | - 'dateFormat' => 'yyyy-MM-dd', | ||
| 40 | - 'clientOptions' => [ | ||
| 41 | - 'changeYear' => true, | ||
| 42 | - 'changeMonth' => true, | ||
| 43 | - ], | ||
| 44 | -]). | ||
| 45 | -"</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> | ||
| 46 | <span class=\"input-group-addon kv-field-separator\"> | 48 | <span class=\"input-group-addon kv-field-separator\"> |
| 47 | <i class=\"glyphicon glyphicon-resize-horizontal\"></i> | 49 | <i class=\"glyphicon glyphicon-resize-horizontal\"></i> |
| 48 | </span> | 50 | </span> |
| 49 | <span class='field-teamsearch-experience_from_to'>". | 51 | <span class='field-teamsearch-experience_from_to'>". |
| 50 | - DatePicker::widget([ | ||
| 51 | - 'model' => $searchModel, | ||
| 52 | - 'attribute' => 'date_add_to', | ||
| 53 | - 'language' => 'ru', | ||
| 54 | - 'dateFormat' => 'yyyy-MM-dd', | ||
| 55 | - 'clientOptions' => [ | ||
| 56 | - 'changeYear' => true, | ||
| 57 | - 'changeMonth' => true, | ||
| 58 | - ], | ||
| 59 | - ]) | ||
| 60 | -."</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> | ||
| 61 | </div>", | 63 | </div>", |
| 62 | - 'format' => 'html', | ||
| 63 | - ], | ||
| 64 | - 'view_count', | ||
| 65 | - [ | ||
| 66 | - 'class' => ActionColumn::className(), | ||
| 67 | - 'buttons' => [ | ||
| 68 | - 'update' => function($url, $model, $key) { | ||
| 69 | - return Html::a('<img src="/images/ico_pencil.png" alt="">', [ | ||
| 70 | - 'blog-update', | ||
| 71 | - 'id' => $model->blog_id, | ||
| 72 | - ],[ | ||
| 73 | - 'title' => 'Редактировать', | ||
| 74 | - ]); | ||
| 75 | - }, | ||
| 76 | - 'delete' => function($url, $model, $key) { | ||
| 77 | - return Html::a('<img src="/images/delete-ico.png" alt="">', [ | ||
| 78 | - 'blog-delete', | ||
| 79 | - 'id' => $model->blog_id, | ||
| 80 | - ], [ | ||
| 81 | - 'title' => 'Удалить', | ||
| 82 | - 'aria-label' => 'Удалить', | ||
| 83 | - 'data-confirm' => 'Вы уверены, что хотите удалить этот элемент?', | ||
| 84 | - 'data-method' => 'post', | ||
| 85 | - 'data-pjax' => '0', | ||
| 86 | - ]); | ||
| 87 | - }, | 64 | + 'format' => 'html', |
| 65 | + ], | ||
| 66 | + 'view_count', | ||
| 67 | + [ | ||
| 68 | + 'class' => ActionColumn::className(), | ||
| 69 | + 'buttons' => [ | ||
| 70 | + 'update' => function($url, $model, $key) { | ||
| 71 | + return Html::a('<img src="/images/ico_pencil.png" alt="">', [ | ||
| 72 | + 'blog-update', | ||
| 73 | + 'id' => $model->blog_id, | ||
| 74 | + ],[ | ||
| 75 | + 'title' => 'Редактировать', | ||
| 76 | + ]); | ||
| 77 | + }, | ||
| 78 | + 'delete' => function($url, $model, $key) { | ||
| 79 | + return Html::a('<img src="/images/delete-ico.png" alt="">', [ | ||
| 80 | + 'blog-delete', | ||
| 81 | + 'id' => $model->blog_id, | ||
| 82 | + ], [ | ||
| 83 | + 'title' => 'Удалить', | ||
| 84 | + 'aria-label' => 'Удалить', | ||
| 85 | + 'data-confirm' => 'Вы уверены, что хотите удалить этот элемент?', | ||
| 86 | + 'data-method' => 'post', | ||
| 87 | + 'data-pjax' => '0', | ||
| 88 | + ]); | ||
| 89 | + }, | ||
| 90 | + ], | ||
| 91 | + 'template' => '{update} {delete}', | ||
| 88 | ], | 92 | ], |
| 89 | - 'template' => '{update} {delete}', | ||
| 90 | ], | 93 | ], |
| 91 | - ], | ||
| 92 | -]); ?> | 94 | + ]); ?> |
| 95 | +</div> | ||
| 96 | + |
frontend/views/accounts/gallery.php
| @@ -16,8 +16,8 @@ | @@ -16,8 +16,8 @@ | ||
| 16 | <div class="admin-all-pages-add"> | 16 | <div class="admin-all-pages-add"> |
| 17 | <?= Html::a(Yii::t('app', 'Добавить'), [ 'gallery-create' ], [ 'class' => 'btn btn-success' ]) ?> | 17 | <?= Html::a(Yii::t('app', 'Добавить'), [ 'gallery-create' ], [ 'class' => 'btn btn-success' ]) ?> |
| 18 | </div> | 18 | </div> |
| 19 | - | ||
| 20 | -<?= GridView::widget([ | 19 | +<div class="admin-table-portfolio admin-table-gallery"> |
| 20 | + <?= GridView::widget([ | ||
| 21 | 'options' => ['class'=>'style admin-all-pages-wr'], | 21 | 'options' => ['class'=>'style admin-all-pages-wr'], |
| 22 | 'dataProvider' => $dataProvider, | 22 | 'dataProvider' => $dataProvider, |
| 23 | 'filterModel' => $searchModel, | 23 | 'filterModel' => $searchModel, |
| @@ -84,3 +84,4 @@ | @@ -84,3 +84,4 @@ | ||
| 84 | ], | 84 | ], |
| 85 | ], | 85 | ], |
| 86 | ]) ?> | 86 | ]) ?> |
| 87 | +</div> | ||
| 87 | \ No newline at end of file | 88 | \ No newline at end of file |
frontend/web/css/style.css
| @@ -6028,8 +6028,9 @@ a {color: #0072bc} | @@ -6028,8 +6028,9 @@ a {color: #0072bc} | ||
| 6028 | width: 70px; | 6028 | width: 70px; |
| 6029 | float: left; | 6029 | float: left; |
| 6030 | margin-right: 10px; | 6030 | margin-right: 10px; |
| 6031 | - | 6031 | + margin-top: 0; |
| 6032 | } | 6032 | } |
| 6033 | +.admin-project-list-two.admin-currency-second {margin-top: 0} | ||
| 6033 | .input-blocks.admin-currency-second select:focus{ | 6034 | .input-blocks.admin-currency-second select:focus{ |
| 6034 | box-shadow: 1px 2px 2px 0px rgba(215, 215, 215, 0.75) inset; | 6035 | box-shadow: 1px 2px 2px 0px rgba(215, 215, 215, 0.75) inset; |
| 6035 | border: 1px solid #dcdcdc; | 6036 | border: 1px solid #dcdcdc; |
| @@ -6079,7 +6080,7 @@ a {color: #0072bc} | @@ -6079,7 +6080,7 @@ a {color: #0072bc} | ||
| 6079 | .input-blocks.admin-project-list.admin-currency-second select {width: 100%} | 6080 | .input-blocks.admin-project-list.admin-currency-second select {width: 100%} |
| 6080 | .input-blocks.admin-project-list-two.admin-currency-second { | 6081 | .input-blocks.admin-project-list-two.admin-currency-second { |
| 6081 | margin-left:0; | 6082 | margin-left:0; |
| 6082 | - padding-top: 18px; | 6083 | + padding-top: 23px; |
| 6083 | width: 80px; | 6084 | width: 80px; |
| 6084 | } | 6085 | } |
| 6085 | .input-blocks.admin-project-list-two.admin-currency-first { | 6086 | .input-blocks.admin-project-list-two.admin-currency-first { |
| @@ -6216,9 +6217,35 @@ input[disabled], select[disabled] { | @@ -6216,9 +6217,35 @@ input[disabled], select[disabled] { | ||
| 6216 | line-height: 31px; | 6217 | line-height: 31px; |
| 6217 | } | 6218 | } |
| 6218 | .admin-table-portfolio .input-group.input-group-xs.input-daterange {width: 200px} | 6219 | .admin-table-portfolio .input-group.input-group-xs.input-daterange {width: 200px} |
| 6220 | +.admin-table-gallery .input-group.input-group-xs input { | ||
| 6221 | + width: 131px; | ||
| 6222 | +} | ||
| 6223 | +.admin-table-gallery .input-group.input-group-xs.input-daterange { | ||
| 6224 | + width: 293px; | ||
| 6225 | +} | ||
| 6219 | .admin-page .content-menu-first {border-top: 1px solid #dfdfdf;} | 6226 | .admin-page .content-menu-first {border-top: 1px solid #dfdfdf;} |
| 6220 | 6227 | ||
| 6221 | - | ||
| 6222 | - | ||
| 6223 | - | ||
| 6224 | - | 6228 | +.admin-menu-list label span {margin-left: 0 !important;margin-right: 0 !important} |
| 6229 | +.admin-page .third-ul-menu li { | ||
| 6230 | + overflow: hidden; | ||
| 6231 | + white-space: nowrap; | ||
| 6232 | + position: relative; | ||
| 6233 | + cursor: default; | ||
| 6234 | +} | ||
| 6235 | +.admin-page .third-ul-menu li:before { | ||
| 6236 | + content: ''; | ||
| 6237 | + height: 36px; | ||
| 6238 | + width: 20px; | ||
| 6239 | + background: #fff; | ||
| 6240 | + opacity: 1; | ||
| 6241 | + position: absolute; | ||
| 6242 | + top: 0; | ||
| 6243 | + right: 0; | ||
| 6244 | + background: -moz-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,1) 100%); | ||
| 6245 | + background: -webkit-linear-gradient(left, rgba(255,255,255,0) 0%,rgba(255,255,255,1) 100%); | ||
| 6246 | + background: linear-gradient(to right, rgba(255,255,255,0) 0%,rgba(255,255,255,1) 100%); | ||
| 6247 | + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#00ffffff', endColorstr='#ffffff',GradientType=1 ); | ||
| 6248 | + z-index: 2; | ||
| 6249 | +} | ||
| 6250 | +.admin-page .third-ul-menu li a{cursor: default} | ||
| 6251 | +.admin-menu-list {margin-top: 37px} |