Administrator / test_3

Commit 37cb2820178d2d627036a97e53a1950a67a19b28

Authored by Виталий
1 parent 144eed4f

tokar commit

Showing 4 changed files with 114 additions and 48 deletions   Show diff stats
Inline Side-by-side
frontend/views/accounts/_projects_form.php
  Show/Hide comments   View file @37cb282
... ... @@ -15,25 +15,37 @@
15 15 use yii\web\JsExpression;
16 16 use yii\widgets\ActiveForm;
17 17  
18   - $this->title = 'Мой профиль';
  18 + $this->title = 'Проекты';
19 19 $this->params[ 'breadcrumbs' ][] = $this->title;
20 20 ?>
21   -<h1><?= $this->title ?></h1>
  21 +<div class="login-left-column-title"><?= $this->title ?></div>
22 22  
23 23 <?php
24 24 $form = ActiveForm::begin();
25 25 ?>
26 26  
27   -<?= $form->field($project, 'name')
28   - ->textInput() ?>
29 27  
30   -<?= $form->field($project, 'link')
31   - ->textInput() ?>
  28 +<div class="input-blocks-wrapper">
  29 + <div class="input-blocks">
  30 + <?= $form->field($project, 'name')
  31 + ->textInput (['class'=> 'custom-input-2']) ?>
  32 + </div>
  33 +</div>
32 34  
33   -<?= $form->field($project, 'project_pid')
34   - ->dropDownList($projects, [ 'prompt' => 'Родительский проект' ]) ?>
  35 +<div class="input-blocks-wrapper">
  36 + <div class="input-blocks">
  37 + <?= $form->field($project, 'link')
  38 + ->textInput (['class'=> 'custom-input-2']) ?>
  39 + </div>
  40 +</div>
35 41  
36 42 <div class="input-blocks-wrapper">
  43 + <div class="input-blocks">
  44 + <?= $form->field($project, 'project_pid')
  45 + ->dropDownList($projects, [ 'prompt' => 'Родительский проект' ]) ?>
  46 + </div>
  47 +</div>
  48 +<div class="input-blocks-wrapper">
37 49 <ul class="content-menu-first">
38 50 <?php foreach($specializations as $specialization):?>
39 51 <li data-img="<?= $specialization->image?>">
... ... @@ -65,35 +77,64 @@
65 77 </ul>
66 78 </div>
67 79  
  80 +
  81 +<div class="conacts-admin style">Адрес проекта:</div>
68 82 <div class="form-inline">
69   - Адрес:
70   - <?= $form->field($project, 'city')
71   - ->widget(Select2::classname(), [
72   - 'options' => [ 'placeholder' => 'Выбор города ...' ],
73   - 'pluginOptions' => [
74   - 'allowClear' => true,
75   - 'minimumInputLength' => 3,
76   - 'ajax' => [
77   - 'url' => \yii\helpers\Url::to([ 'site/city' ]),
78   - 'dataType' => 'json',
79   - 'data' => new JsExpression('function(params) { return {q:params.term}; }'),
80   - ],
81   - 'escapeMarkup' => new JsExpression('function (markup) { return markup; }'),
82   - 'templateResult' => new JsExpression('function(city) { return city.text; }'),
83   - 'templateSelection' => new JsExpression('function (city) { return city.text; }'),
84   - ],
85   - ]); ?>
86   - <?= $form->field($project, 'street', [ 'template' => "{label}{input}{hint}{error}" ])
87   - ->textInput() ?>
88   - <?= $form->field($project, 'house', [ 'template' => "{label}{input}{hint}{error}" ])
89   - ->textInput() ?>
  83 + <div class="input-blocks-wrapper">
  84 + <div class="input-blocks">
  85 + <?= $form->field($project, 'city')
  86 + ->widget(Select2::classname(), [
  87 + 'options' => [ 'placeholder' => 'Выбор города ...' ],
  88 + 'pluginOptions' => [
  89 + 'allowClear' => true,
  90 + 'minimumInputLength' => 3,
  91 + 'ajax' => [
  92 + 'url' => \yii\helpers\Url::to([ 'site/city' ]),
  93 + 'dataType' => 'json',
  94 + 'data' => new JsExpression('function(params) { return {q:params.term}; }'),
  95 + ],
  96 + 'escapeMarkup' => new JsExpression('function (markup) { return markup; }'),
  97 + 'templateResult' => new JsExpression('function(city) { return city.text; }'),
  98 + 'templateSelection' => new JsExpression('function (city) { return city.text; }'),
  99 + ],
  100 + ]);
  101 + ?>
  102 + </div>
  103 +
  104 +
  105 +
  106 +
  107 +
  108 + <div class="input-blocks street-input">
  109 + <?= $form->field($project, 'street', [ 'template' => "{label}{input}{hint}{error}" ])
  110 + ->textInput (['class'=> 'custom-input-2']) ?>
  111 + </div>
  112 +
  113 +
  114 +
  115 + <div class="input-blocks home-input">
  116 + <?= $form->field($project, 'house', [ 'template' => "{label}{input}{hint}{error}" ])
  117 + ->textInput (['class'=> 'custom-input-2']) ?>
  118 + </div>
  119 + </div>
90 120 </div>
91 121  
92   -<?= $form->field($project, 'budget')
93   - ->textInput() ?>
  122 +<div class="input-blocks-wrapper">
  123 + <div class="input-blocks">
  124 + <?= $form->field($project, 'budget')
  125 + ->textInput (['class'=> 'custom-input-2','type'=>'number']) ?>
  126 + </div>
  127 + <div class="input-blocks home-input">
  128 + <?= $form->field($project, 'budget')
  129 + ->textInput (['class'=> 'custom-input-2','type'=>'number']) ?>
  130 + </div>
  131 + <div class="input-blocks home-input">
  132 + <?= $form->field($project, 'contractual')
  133 + ->checkbox() ?>
  134 + </div>
  135 +
  136 +</div>
94 137  
95   -<?= $form->field($project, 'contractual')
96   - ->checkbox() ?>
97 138  
98 139 <?= $form->field($project, 'payment_variant')
99 140 ->radioList([
... ... @@ -103,9 +144,13 @@
103 144  
104 145 <?= $form->field($project, 'paymentInput')
105 146 ->checkboxList($payment) ?>
  147 +<div class="input-blocks-wrapper">
  148 + <div class="input-blocks">
  149 + <?= $form->field($project, 'deadline', [ 'template' => "{label}{input} дней\n{hint}\n{error}" ])
  150 + ->textInput (['class'=> 'custom-input-2','type'=>'number']) ?>
  151 + </div>
  152 +</div>
106 153  
107   -<?= $form->field($project, 'deadline', [ 'template' => "{label}{input} дней\n{hint}\n{error}" ])
108   - ->input('number') ?>
109 154  
110 155 <?= $form->field($project, 'description')
111 156 ->widget(CKEditor::className()) ?>
... ...
frontend/views/accounts/_team_form.php
  Show/Hide comments   View file @37cb282
... ... @@ -119,3 +119,10 @@
119 119 <?php
120 120 $form->end();
121 121 ?>
  122 +<script>
  123 + $(document).ready(function(){
  124 + $('.input-blocks-wrapper.admn-select-company select').change(function(){
  125 + $(this).blur()
  126 + })
  127 + })
  128 +</script>
... ...
frontend/views/accounts/description.php
  Show/Hide comments   View file @37cb282
... ... @@ -15,12 +15,24 @@
15 15 $this->title = 'Описание';
16 16 $this->params[ 'breadcrumbs' ][] = $this->title;
17 17 ?>
18   -<h1><?= $this->title ?></h1>
  18 +<div class="login-left-column-title"><?= $this->title ?></div>
19 19 <?php
20 20 $form = ActiveForm::begin();
21 21 ?>
22   - <?= $form->field($user_info, 'about')->label(false)->widget(CKEditor::className()) ?>
23   - <?= Html::submitButton('Обновить', [ 'class' => 'btn btn-primary' ]) ?>
  22 +<div class="input-blocks-wrapper full-blocks admin-editor-bl" style="margin-top: 30px">
  23 + <div class="input-blocks">
  24 + <?= $form->field($user_info, 'about')->label(false)->widget(CKEditor::className()) ?>
  25 + </div>
  26 +</div>
  27 +
  28 +<div class="input-blocks-wrapper">
  29 + <div class="admin-save-btn skills-save-btn style">
  30 + <?= Html::submitButton('Добавить', ['class' => 'input-blocks-wrapper button']) ?>
  31 + </div>
  32 +</div>
  33 +
  34 +
  35 +
24 36 <?php
25 37 $form->end();
26 38 ?>
... ...
frontend/web/css/style.css
  Show/Hide comments   View file @37cb282
... ... @@ -5259,6 +5259,7 @@ input.disabled.admin-check:checked + label, input.disabled.admin-check:checked +
5259 5259 background: #0072bc;
5260 5260 border-radius: 4px;
5261 5261 margin-left: -10px;
  5262 + margin-bottom: 50px;
5262 5263 }
5263 5264 .login-left-column {
5264 5265 width: 720px;
... ... @@ -5937,10 +5938,14 @@ a {color: #0072bc}
5937 5938 outline: none;
5938 5939 border-radius: 0;
5939 5940 }
5940   -.input-blocks-wrapper.admn-select-company select:focus, .input-blocks-wrapper.admn-select-company select:active {
  5941 +.input-blocks-wrapper.admn-select-company select:focus{
5941 5942 border: 1px solid #dcdcdc;
5942 5943 box-shadow: 1px 2px 2px 0px rgba(215, 215, 215, 0.75) inset;
5943 5944 transition: 0.1s;
  5945 +
  5946 +}
  5947 +.input-blocks-wrapper.admn-select-company select:focus{
  5948 + background: url("/images/sets-ico/select-arrow-up.png") right center no-repeat;
5944 5949 }
5945 5950 .input-blocks-wrapper.amin-team-foto .admin-avatar-pattern{
5946 5951 background: none;
... ... @@ -6003,13 +6008,10 @@ a {color: #0072bc}
6003 6008 transition: 0.1s;
6004 6009 }
6005 6010 .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}
6006   -.admin-gallery-photos-load-wr {}
6007   -.admin-gallery-photos-load-wr {}
6008   -.admin-gallery-photos-load-wr {}
6009   -.admin-gallery-photos-load-wr {}
6010   -.admin-gallery-photos-load-wr {}
6011   -.admin-gallery-photos-load-wr {}
6012   -.admin-gallery-photos-load-wr {}
6013   -.admin-gallery-photos-load-wr {}
6014   -.admin-gallery-photos-load-wr {}
6015 6011  
  6012 +@media (min-width: 768px) {
  6013 + .form-inline .form-group {
  6014 + display: block;
  6015 + vertical-align: baseline;
  6016 + }
  6017 +}
... ...