diff --git a/frontend/views/accounts/_blog_form.php b/frontend/views/accounts/_blog_form.php index 0bd4c20..e814760 100644 --- a/frontend/views/accounts/_blog_form.php +++ b/frontend/views/accounts/_blog_form.php @@ -43,19 +43,20 @@ +
+ $blog, + 'field'=>'cover', + 'width'=>340, + 'height'=>260, + 'multi'=>false, + 'gallery' =>$blog->cover, + 'name' => 'Загрузить миниатюру статьи' + ]); + ?> +
- $blog, - 'field'=>'cover', - 'width'=>340, - 'height'=>260, - 'multi'=>false, - 'gallery' =>$blog->cover, - 'name' => 'Загрузить главное фото' -]); -?> - -
+
'input-blocks-wrapper button']) ?> ' remove input-blocks-wrapper button']) ?> diff --git a/frontend/views/accounts/_portfolio_form.php b/frontend/views/accounts/_portfolio_form.php index 90bed6b..3fc0cda 100644 --- a/frontend/views/accounts/_portfolio_form.php +++ b/frontend/views/accounts/_portfolio_form.php @@ -88,6 +88,21 @@ use yii\web\JsExpression;
До 3 Мб файл
+
+
Фото главное
+
Файл не выбран
+ $portfolio, + 'field'=>'cover', + 'width'=>100, + 'height'=>100, + 'multi'=>false, + 'gallery' =>$portfolio->cover, + 'name' => 'Загрузить' + ]); + ?> +
До 3 Мб файл
+
@@ -95,7 +110,7 @@ use yii\web\JsExpression;
field($portfolio, 'city')->widget(Select2::classname(), [ - 'options' => ['placeholder' => 'Выбор города ...'], + 'options' => ['class' => 'Выбор города ...'], 'pluginOptions' => [ 'allowClear' => true, 'minimumInputLength' => 3, @@ -147,3 +162,8 @@ use yii\web\JsExpression; end(); ?> + \ No newline at end of file diff --git a/frontend/views/accounts/_vacancy_form.php b/frontend/views/accounts/_vacancy_form.php index ed85dc4..20a6b7a 100644 --- a/frontend/views/accounts/_vacancy_form.php +++ b/frontend/views/accounts/_vacancy_form.php @@ -11,10 +11,10 @@ use yii\helpers\Html; use yii\widgets\ActiveForm; - $this->title = 'Мой профиль'; + $this->title = 'Вакансии'; $this->params[ 'breadcrumbs' ][] = $this->title; ?> -

title ?>

+ 'requirements', 'item_id' => $vacancy->vacancy_id, 'model' => 'common\models\Vacancy', 'language' => 'ru', ] ); ?> +
+
+ field($vacancy, 'description')->widget(CKEditor::className()) ?> +
+
-field($vacancy, 'description')->widget(CKEditor::className()) ?> +
+ +
- end(); diff --git a/frontend/views/accounts/contacts.php b/frontend/views/accounts/contacts.php index 577feab..79a0969 100755 --- a/frontend/views/accounts/contacts.php +++ b/frontend/views/accounts/contacts.php @@ -12,7 +12,14 @@ $user = \Yii::$app->user->identity; ?> - +
diff --git a/frontend/views/accounts/portfolio.php b/frontend/views/accounts/portfolio.php index b42caae..60f0d0b 100755 --- a/frontend/views/accounts/portfolio.php +++ b/frontend/views/accounts/portfolio.php @@ -35,13 +35,15 @@ 'class' => ActionColumn::className(), 'buttons' => [ 'update' => function($url, $model, $key) { - return Html::a('Update', [ + return Html::a('', [ 'portfolio-update', 'id' => $model->portfolio_id, + ],[ + 'title' => 'Редактировать', ]); }, 'delete' => function($url, $model, $key) { - return Html::a('Delete', [ + return Html::a('', [ 'portfolio-delete', 'id' => $model->portfolio_id, ], [ diff --git a/frontend/views/accounts/projects.php b/frontend/views/accounts/projects.php index 033f8b7..d61a4e2 100755 --- a/frontend/views/accounts/projects.php +++ b/frontend/views/accounts/projects.php @@ -12,11 +12,12 @@ $this->title = 'Проекты'; $this->params[ 'breadcrumbs' ][] = $this->title; ?> -

title ?>

+

'btn btn-success' ]) ?>

['class'=>'style admin-all-pages-wr'], 'dataProvider' => $dataProvider, 'filterModel' => $searchModel, 'columns' => [ @@ -35,13 +36,15 @@ 'class' => ActionColumn::className(), 'buttons' => [ 'update' => function($url, $model, $key) { - return Html::a('Update', [ + return Html::a('', [ 'projects-update', 'id' => $model->project_id, + ],[ + 'title' => 'Редактировать', ]); }, 'delete' => function($url, $model, $key) { - return Html::a('Delete', [ + return Html::a('', [ 'projects-delete', 'id' => $model->project_id, ], [ diff --git a/frontend/views/accounts/service.php b/frontend/views/accounts/service.php index 97a1406..64f9f2b 100755 --- a/frontend/views/accounts/service.php +++ b/frontend/views/accounts/service.php @@ -10,63 +10,186 @@ use yii\helpers\Html; use yii\widgets\ActiveForm; - $this->title = 'Мой профиль'; + $this->title = 'Услуги'; $this->params[ 'breadcrumbs' ][] = $this->title; ?> -

title ?>

-

Рекомендуем детально заполнить для исполнителя. Это сильно влияет на количество заказов.

- -field($user_info, 'salary', [ - 'template' => "{label}: от {input} за час\n{hint}\n{error}", - 'options' => [ 'class' => 'form-inline' ], -]) - ->label('Стоимость работ') - ->textInput() ?> -field($user, 'specializationInput') - ->label('Специализация услуг') - ->checkboxList($specialization) ?> -field($user_info, 'guarantee', [ - 'template' => "{label}: {input} лет\n{hint}\n{error}", - 'options' => [ 'class' => 'form-inline' ], -]) - ->label('Гарантия качества работ') - ->textInput() ?> -field($user_info, 'contract', [ 'options' => [ 'class' => 'form-inline' ] ]) - ->label('Работа по договору') - ->radioList([ - 0 => 'Да', - 1 => 'Нет', - ], [ 'class' => 'form-control-static' ]) ?> -field($user_info, 'estimate', [ 'options' => [ 'class' => 'form-inline' ] ]) - ->label('Предоставляете смету') - ->radioList([ - 0 => 'Да', - 1 => 'Нет', - ], [ 'class' => 'form-control-static' ]) ?> -field($user_info, 'purchase', [ 'options' => [ 'class' => 'form-inline' ] ]) - ->label('Делаете сами закупку материалов') - ->radioList([ - 0 => 'Да', - 1 => 'Нет', - ], [ 'class' => 'form-control-static' ]) ?> -field($user_info, 'delivery', [ 'options' => [ 'class' => 'form-inline' ] ]) - ->label('Занимаетесь сами доставкой материалов') - ->radioList([ - 0 => 'Да', - 1 => 'Нет', - ], [ 'class' => 'form-control-static' ]) ?> -field($user_info, 'prepayment', [ - 'template' => "{label}: {input} %\n{hint}\n{error}", - 'options' => [ 'class' => 'form-inline' ], -]) - ->label('Минимальная предоплата за работы') - ->textInput() ?> -field($user, 'paymentInput') - ->label('Способы оплаты') - ->checkboxList($payment) ?> - -end(); -?> + +
+ +
+
+ field($user_info, 'salary', [ + 'template' => "{label}
от{input}ВЫБОР ВАЛЮТЫ!!!!!!!за час\n{hint}\n{error}", + 'options' => [ 'class' => 'form-inline' ], + ]) + ->label('Стоимость работ') + ->textInput (['class'=> 'custom-input-2 custom-input-2-date','type'=>'number']); + ?> +
+
+ + + +
+
+ field($user, 'specializationInput') + ->label('Специализация услуг') + ->checkboxList($specialization) ?> +
+
+
+
+ Гоеграфия работ????????????? +
+
+
+
+ field($user_info, 'guarantee', [ + 'template' => "{label}
{input}лет\n{hint}\n{error}", + 'options' => [ 'class' => 'form-inline' ], + ]) + ->label('Гарантия качества работ') + ->textInput (['class'=> 'custom-input-2 custom-input-2-date custom-input-2-margin-r','type'=>'number']) ?> +
+
+ +
+
+ field($user_info, 'contract', [ 'options' => [ 'class' => 'form-inline' ] ]) + ->label('Работа по договору') + ->radioList([ + 0 => 'Да', + 1 => 'Нет', + ], + [ + 'item' => function($index, $label, $name, $checked, $value) { + $return = '
'; + $return .= ''; + $return .= ''; + $return .= '
'; + return $return; + } + ]) ?> +
+
+ +
+
+ field($user_info, 'estimate', [ 'options' => [ 'class' => 'form-inline' ] ]) + ->label('Предоставляете смету') + ->radioList([ + 0 => 'Да', + 1 => 'Нет', + ], [ + 'item' => function($index, $label, $name, $checked, $value) { + $return = '
'; + $return .= ''; + $return .= ''; + $return .= '
'; + return $return; + } + ]) ?> +
+
+ +
+
+ field($user_info, 'purchase', [ 'options' => [ 'class' => 'form-inline' ] ]) + ->label('Делаете сами закупку материалов') + ->radioList([ + 0 => 'Да', + 1 => 'Нет', + ], [ + 'item' => function($index, $label, $name, $checked, $value) { + $return = '
'; + $return .= ''; + $return .= ''; + $return .= '
'; + return $return; + } + ]) ?> +
+
+
+
+ field($user_info, 'delivery', [ 'options' => [ 'class' => 'form-inline' ] ]) + ->label('Занимаетесь сами доставкой материалов') + ->radioList([ + 0 => 'Да', + 1 => 'Нет', + ], [ + 'item' => function($index, $label, $name, $checked, $value) { + $return = '
'; + $return .= ''; + $return .= ''; + $return .= '
'; + return $return; + } + ]) ?> +
+
+ +
+
+ field($user_info, 'prepayment', [ + 'template' => "{label}
{input}%\n{hint}\n{error}", + 'options' => [ 'class' => 'form-inline' ], + ]) + ->label('Минимальная предоплата за работы') + ->textInput (['class'=> 'custom-input-2 custom-input-2-date custom-input-2-margin-r','type'=>'number'])?> +
+
+ +
+
+ field($user, 'paymentInput', [ 'template' => "{label}\n{input}\n{error}" ]) + ->label('Способы оплаты') + ->checkboxList($payment, + [ + 'item' => function($index, $label, $name, $checked, $value) { + $return = '
'; + $return .= ''; + $return .= ''; + $return .= '
'; + return $return; + } + ] + ) ?> +
+
+ + + + + + + +
+
+ +
+
+ + end(); + ?> +
\ No newline at end of file diff --git a/frontend/views/accounts/vacancy.php b/frontend/views/accounts/vacancy.php index f35647b..b108b20 100644 --- a/frontend/views/accounts/vacancy.php +++ b/frontend/views/accounts/vacancy.php @@ -12,11 +12,12 @@ $this->title = 'Вакансии'; $this->params[ 'breadcrumbs' ][] = $this->title; ?> -

title ?>

-

+

+
'btn btn-success' ]) ?> -

+
['class'=>'style admin-all-pages-wr'], 'dataProvider' => $dataProvider, 'filterModel' => $searchModel, 'columns' => [ @@ -30,10 +31,10 @@ 'class' => ActionColumn::className(), 'buttons' => [ 'update' => function($url, $model, $key) { - return Html::a('Update', ['vacancy-update', 'id' => $model->vacancy_id]); + return Html::a('', ['vacancy-update', 'id' => $model->vacancy_id]); }, 'delete' => function($url, $model, $key) { - return Html::a('Delete', ['vacancy-delete', 'id' => $model->vacancy_id], [ + return Html::a('', ['vacancy-delete', 'id' => $model->vacancy_id], [ 'title' => 'Удалить', 'aria-label' => 'Удалить', 'data-confirm' => 'Вы уверены, что хотите удалить этот элемент?', diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css index 0f5b6b0..8e03cf5 100755 --- a/frontend/web/css/style.css +++ b/frontend/web/css/style.css @@ -4616,6 +4616,7 @@ input.custom-radio + label, input.custom-check + label { cursor: pointer; margin-left: 6px; display: inline; + font-weight: normal; } input.custom-radio:checked + label, input.custom-check:checked + label { color: #0072bc; @@ -5050,6 +5051,9 @@ input.disabled.admin-check:checked + label, input.disabled.admin-check:checked + color: #fff; } + + + /***login***/ .section-box.admin-page {margin-top: 30px} .login-right-column { @@ -5109,9 +5113,7 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last- } -.login-left-column-title {border-bottom: 1px solid #dbdbdb; margin-top: 15px; padding-bottom: 23px;} -.login-left-column-title span {} -.login-left-column-title p {font-size: 13px; color: #b7b7b7} +.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} .border-general { @@ -5637,7 +5639,11 @@ a {color: #0072bc} .admin-all-pages-wr table .form-control:focus {border: 1px solid #dcdcdc;box-shadow: 1px 2px 2px 0px rgba(215, 215, 215, 0.75) inset; transition: 0.1s; outline: none} .admin-all-pages-wr table tbody tr td {padding: 4px 8px; vertical-align: middle} .admin-all-pages-wr table {font-size: 13px} -.admin-all-pages-wr .table > thead > tr > th {vertical-align: middle} +.admin-all-pages-wr table > thead > tr > th {vertical-align: middle} +.admin-all-pages-wr table tr td:last-child{width: 52px; padding: 0 8px} +.admin-all-pages-wr table tr td:last-child a{margin-left: 5px} +.admin-all-pages-wr table tr td:last-child a:first-child{margin-left: 0} +.admin-all-pages-wr table .empty{font-size: 15px; margin: 10px 0} .admin-all-pages-wr .pagination {float: right} .admin-all-pages-wr .pagination > li > a, .pagination > li > span { background: none; @@ -5650,12 +5656,63 @@ a {color: #0072bc} .admin-all-pages-wr .pagination > li.active > a, .admin-all-pages-wr .pagination > li.active > span { color: inherit; } + .admin-all-pages-wr .pagination > li.active a:hover, .admin-all-pages-wr .pagination > li.active span:hover { color: inherit; background: none; } +.admin-all-pages-wr .pagination > li.active > a:focus, .admin-all-pages-wr .pagination > li.active > span:focus {background: none} +.admin-all-pages-wr .summary{margin-bottom: 10px} +.admin-blog-min-img { - - - +} +.admin-blog-min-img .file-uploader-block {width: 340px} +.admin-blog-min-img .tst { + width: 100%; + height: 260px; + background: #f1f1f1; +} +.admin-blog-min-img .admin-avatar-pattern-wr { + width: 340px; +} +.admin-blog-min-img .admin-avatar-pattern { + width: 340px; + height: 260px; + background: none; +} +.admin-blog-min-img .admin-ava-wr { + width: 340px; + height: 260px; +} +.admin-blog-min-img .uploader-button { + width: auto; + padding: 0 10px; + margin-left: 0} +.admin-blog-min-img #cover_buttons_block { + position: absolute; + height: 29px; + float: left; + top: 260px; + left: 199px; +} +.admin-blog-min-img .admin-ava-wr { + background: none; +} +.admin-save-btn.admin-save-btn-fix-line {margin-top: 19px} +.admin-save-btn.admin-save-btn-fix-line button { + line-height: normal; +} +.custom-input-2-margin-r { + margin-right: 10px; +} +.admn-input-txt { + font-size: 13px; +} +.admin-who-check-payment .custom-check + label span { + margin-left: 0; +} +.admin-who-check-payment .custom-check + label:hover {border-bottom: 1px solid #333333} +.admin-service-wr .input-blocks-wrapper { + margin-top: 24px; +} \ No newline at end of file -- libgit2 0.21.4