diff --git a/frontend/views/accounts/_projects_form.php b/frontend/views/accounts/_projects_form.php index 8573997..835c9fe 100644 --- a/frontend/views/accounts/_projects_form.php +++ b/frontend/views/accounts/_projects_form.php @@ -15,25 +15,37 @@ use yii\web\JsExpression; use yii\widgets\ActiveForm; - $this->title = 'Мой профиль'; + $this->title = 'Проекты'; $this->params[ 'breadcrumbs' ][] = $this->title; ?> -

title ?>

+
title ?>
-field($project, 'name') - ->textInput() ?> -field($project, 'link') - ->textInput() ?> +
+
+ field($project, 'name') + ->textInput (['class'=> 'custom-input-2']) ?> +
+
-field($project, 'project_pid') - ->dropDownList($projects, [ 'prompt' => 'Родительский проект' ]) ?> +
+
+ field($project, 'link') + ->textInput (['class'=> 'custom-input-2']) ?> +
+
+
+ field($project, 'project_pid') + ->dropDownList($projects, [ 'prompt' => 'Родительский проект' ]) ?> +
+
+
+ +
Адрес проекта:
- Адрес: - field($project, 'city') - ->widget(Select2::classname(), [ - 'options' => [ 'placeholder' => 'Выбор города ...' ], - 'pluginOptions' => [ - 'allowClear' => true, - 'minimumInputLength' => 3, - 'ajax' => [ - 'url' => \yii\helpers\Url::to([ 'site/city' ]), - 'dataType' => 'json', - 'data' => new JsExpression('function(params) { return {q:params.term}; }'), - ], - 'escapeMarkup' => new JsExpression('function (markup) { return markup; }'), - 'templateResult' => new JsExpression('function(city) { return city.text; }'), - 'templateSelection' => new JsExpression('function (city) { return city.text; }'), - ], - ]); ?> - field($project, 'street', [ 'template' => "{label}{input}{hint}{error}" ]) - ->textInput() ?> - field($project, 'house', [ 'template' => "{label}{input}{hint}{error}" ]) - ->textInput() ?> +
+
+ field($project, 'city') + ->widget(Select2::classname(), [ + 'options' => [ 'placeholder' => 'Выбор города ...' ], + 'pluginOptions' => [ + 'allowClear' => true, + 'minimumInputLength' => 3, + 'ajax' => [ + 'url' => \yii\helpers\Url::to([ 'site/city' ]), + 'dataType' => 'json', + 'data' => new JsExpression('function(params) { return {q:params.term}; }'), + ], + 'escapeMarkup' => new JsExpression('function (markup) { return markup; }'), + 'templateResult' => new JsExpression('function(city) { return city.text; }'), + 'templateSelection' => new JsExpression('function (city) { return city.text; }'), + ], + ]); + ?> +
+ + + + + +
+ field($project, 'street', [ 'template' => "{label}{input}{hint}{error}" ]) + ->textInput (['class'=> 'custom-input-2']) ?> +
+ + + +
+ field($project, 'house', [ 'template' => "{label}{input}{hint}{error}" ]) + ->textInput (['class'=> 'custom-input-2']) ?> +
+
-field($project, 'budget') - ->textInput() ?> +
+
+ field($project, 'budget') + ->textInput (['class'=> 'custom-input-2','type'=>'number']) ?> +
+
+ field($project, 'budget') + ->textInput (['class'=> 'custom-input-2','type'=>'number']) ?> +
+
+ field($project, 'contractual') + ->checkbox() ?> +
+ +
-field($project, 'contractual') - ->checkbox() ?> field($project, 'payment_variant') ->radioList([ @@ -103,9 +144,13 @@ field($project, 'paymentInput') ->checkboxList($payment) ?> +
+
+ field($project, 'deadline', [ 'template' => "{label}{input} дней\n{hint}\n{error}" ]) + ->textInput (['class'=> 'custom-input-2','type'=>'number']) ?> +
+
-field($project, 'deadline', [ 'template' => "{label}{input} дней\n{hint}\n{error}" ]) - ->input('number') ?> field($project, 'description') ->widget(CKEditor::className()) ?> diff --git a/frontend/views/accounts/_team_form.php b/frontend/views/accounts/_team_form.php index 5e53921..cbe71cc 100644 --- a/frontend/views/accounts/_team_form.php +++ b/frontend/views/accounts/_team_form.php @@ -119,3 +119,10 @@ end(); ?> + diff --git a/frontend/views/accounts/description.php b/frontend/views/accounts/description.php index 56d56a1..13fbf80 100644 --- a/frontend/views/accounts/description.php +++ b/frontend/views/accounts/description.php @@ -15,12 +15,24 @@ $this->title = 'Описание'; $this->params[ 'breadcrumbs' ][] = $this->title; ?> -

title ?>

+
title ?>
- field($user_info, 'about')->label(false)->widget(CKEditor::className()) ?> - 'btn btn-primary' ]) ?> +
+
+ field($user_info, 'about')->label(false)->widget(CKEditor::className()) ?> +
+
+ +
+
+ 'input-blocks-wrapper button']) ?> +
+
+ + + end(); ?> diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css index d2c59d4..6d62c78 100755 --- a/frontend/web/css/style.css +++ b/frontend/web/css/style.css @@ -5259,6 +5259,7 @@ input.disabled.admin-check:checked + label, input.disabled.admin-check:checked + background: #0072bc; border-radius: 4px; margin-left: -10px; + margin-bottom: 50px; } .login-left-column { width: 720px; @@ -5937,10 +5938,14 @@ a {color: #0072bc} outline: none; border-radius: 0; } -.input-blocks-wrapper.admn-select-company select:focus, .input-blocks-wrapper.admn-select-company select:active { +.input-blocks-wrapper.admn-select-company select:focus{ border: 1px solid #dcdcdc; box-shadow: 1px 2px 2px 0px rgba(215, 215, 215, 0.75) inset; transition: 0.1s; + +} +.input-blocks-wrapper.admn-select-company select:focus{ + background: url("/images/sets-ico/select-arrow-up.png") right center no-repeat; } .input-blocks-wrapper.amin-team-foto .admin-avatar-pattern{ background: none; @@ -6003,13 +6008,10 @@ a {color: #0072bc} transition: 0.1s; } .admin-gallery-photos-load-wr .uploader-button:focus, .admin-gallery-photos-load-wr .uploader-button:active {background: #00568e;color: #fff;border: 1px solid #0072bc;box-shadow: none} -.admin-gallery-photos-load-wr {} -.admin-gallery-photos-load-wr {} -.admin-gallery-photos-load-wr {} -.admin-gallery-photos-load-wr {} -.admin-gallery-photos-load-wr {} -.admin-gallery-photos-load-wr {} -.admin-gallery-photos-load-wr {} -.admin-gallery-photos-load-wr {} -.admin-gallery-photos-load-wr {} +@media (min-width: 768px) { + .form-inline .form-group { + display: block; + vertical-align: baseline; + } +} -- libgit2 0.21.4