tokar commit

Виталий
1 parent a33b71b5
Showing 4 changed files with 132 additions and 21 deletions Show diff stats
frontend/views/accounts/_projects_form.php
frontend/views/accounts/_vacancy_form.php
frontend/views/accounts/service.php
frontend/web/css/style.css
@@ -41,7 +41,7 @@
 </div>
 <div class="input-blocks-wrapper">
-    <div class="input-blocks">
+    <div class="input-blocks admin-project-list admin-currency-second">
         <?= $form->field($project, 'project_pid')
             ->dropDownList($projects, [ 'prompt' => 'Родительский проект' ]) ?>
     </div>
@@ -121,28 +121,45 @@
 </div>
 <div class="input-blocks-wrapper">
-    <div class="input-blocks">
-        <?= $form->field($project, 'budget')
-            ->textInput (['class'=> 'custom-input-2','type'=>'number']) ?>
+    <div class="input-blocks admin-project-list-two admin-currency-first">
+        <?= $form->field($project, 'budget', [
+            'template' => "{label}<br />{input}\n{hint}\n{error}"
+        ])
+            ->textInput (['class'=> 'custom-input-2 custom-input-2-date','type'=>'number']) ?>
     </div>
-    <div class="input-blocks home-input">
+    <div class="input-blocks admin-project-list-two admin-currency-second">
         <?=
             $form->field($project, 'budget_currency')->label(false)->dropDownList(Currency::getCurrencyDropdown(), ['class'=> 'custom-input-2']);
         ?>
     </div>
-    <div class="input-blocks home-input">
-        <?= $form->field($project, 'contractual')
-            ->checkbox() ?>
+    <div class="input-blocks admin-who-check-payment admin-project-contractual">
+        <?= $form->field($project, 'contractual', ['template' => "{input}{label}\n{hint}\n{error}"])
+            ->checkbox (['class'=> 'custom-check'], false)
+            ->label ('<span></span>Договорной')
+        ?>
     </div>
 </div>
+<div class="input-blocks-wrapper">
+    <?= $form->field($project, 'payment_variant')
+        ->radioList([
+            1 => 'Без предоплаты',
+            2 => 'Предоплата возможна',
+        ],[
+            'item' => function($index, $label, $name, $checked, $value) {
+                $return = '<div class="admin-who-check">';
+                $return .= '<input class="custom-radio" id="select_admin_mfp'.$value.'" type="radio" name="' . $name . '" value="' . $value . '" '.($checked ? "checked" :"").' >';
+                $return .= '<label for="select_admin_mfp'.$value.'" >';
+                $return .= '<span></span>' . ucwords($label);
+                $return .= '</label>';
+                $return .= '</div>';
+                return $return;
+            }
+        ]) ?>
+</div>
+
-<?= $form->field($project, 'payment_variant')
-         ->radioList([
-             1 => 'Без предоплаты',
-             2 => 'Предоплата возможна',
-         ]) ?>
 <?= $form->field($project, 'paymentInput')
          ->checkboxList($payment) ?>
@@ -191,3 +208,21 @@
 <?php
     $form->end();
 ?>
+<script>
+    $(document).ready(function(){
+        $('.input-blocks.admin-currency-second select').change(function(){
+            $(this).blur()
+        })
+
+        if($('.admin-project-contractual input[type="checkbox"]').prop("checked")) {
+            $('.admin-project-list-two input, .admin-project-list-two select').attr('disabled', 'disabled')
+        }
+        $('.admin-project-contractual input[type="checkbox"]').change(function(){
+           if($(this).prop("checked")) {
+               $('.admin-project-list-two input, .admin-project-list-two select').attr('disabled','disabled')
+           } else {
+               $('.admin-project-list-two input, .admin-project-list-two select').removeAttr('disabled')
+           }
+        })
+    })
+</script>
 \ No newline at end of file
@@ -78,14 +78,27 @@
 </div>
 <div class="input-blocks-wrapper">
-    <div class="input-blocks">
-        <?= $form->field($vacancy, 'salary')
-                 ->textInput (['class'=> 'custom-input-2']); ?>
-        <?= $form->field($vacancy, 'salary_currency')
-                 ->label(false)->dropDownList($currencies); ?>
+    <div class="input-blocks admin-currency-first">
+        <?= $form->field($vacancy, 'salary', [
+            'template' => "{label}<br /><span class='admn-input-txt'>от</span>{input}\n{hint}\n{error}",
+            'options'  => [ 'class' => 'form-inline' ],
+        ])
+            ->label('Заработная плата')
+            ->textInput (['class'=> 'custom-input-2 custom-input-2-date','type'=>'number']);
+        ?>
+    </div>
+    <div class="input-blocks admin-currency-second">
+        <?=
+        $form->field($vacancy, 'salary_currency', [
+            'template' => "{input}<span class='admn-input-txt' style='padding-top: 7px; display: block'>за час</span>\n{hint}\n{error}",
+        ])
+            ->label(false)
+            ->dropDownList($currencies)
+        ?>
     </div>
 </div>
+
 <div class="input-blocks-wrapper">
     <ul class="content-menu-first">
         <?php foreach($specializations as $specialization): ?>
@@ -183,3 +196,10 @@
 <?php
     $form->end();
 ?>
+<script>
+    $(document).ready(function(){
+        $('.input-blocks.admin-currency-second select').change(function(){
+            $(this).blur()
+        })
+    })
+</script>
 \ No newline at end of file
@@ -88,7 +88,7 @@
             <?php endforeach; ?>
         </ul>
     </div>
-    <div class="input-blocks-wrapper">
+    <div class="input-blocks-wrapper admin-city-array">
         <div class="input-blocks">
             <?= $form->field($user_info, 'geographies')
                      ->widget(Select2::classname(), [
@@ -249,7 +249,8 @@
     <?php
         $form->end();
     ?>
-</div><script>
+</div>
+<script>
     $(document).ready(function(){
         $('.input-blocks.admin-currency-second select').change(function(){
             $(this).blur()
@@ -4620,7 +4620,7 @@ input.custom-radio + label, input.custom-check + label {
     font-weight: normal;
 }
 input.custom-radio:checked + label, input.custom-check:checked + label {
-    color: #0072bc;
+    color: #0072bc !important;
     /*border-bottom: 1px solid #0072bc;*/
     border:none !important;
 }
@@ -6037,4 +6037,59 @@ a {color: #0072bc}
 }
 .input-blocks.admin-currency-second .has-success select {
     border: 1px solid #dcdcdc;
+}
+.admin-city-array .select2-selection {border-radius: 0; position: relative}
+.admin-city-array .select2-selection:before {
+    height: 28px;
+    width: 25px;
+    background: url("/images/sets-ico/select-arrow.jpg") no-repeat !important;
+    content: '';
+    display: block;
+    position: absolute;
+    top: 0;
+    right: 0;
+}
+.admin-city-array .select2-container--focus .select2-selection:before, .admin-city-array .select2-container--open .select2-selection:before {
+    background: url("/images/sets-ico/select-arrow-up.png") no-repeat !important;
+}
+.admin-city-array  .select2-container--krajee .select2-selection--multiple {
+    min-height: 28px;
+}
+.admin-city-array  .select2-container--krajee .select2-selection--multiple .select2-search--inline .select2-search__field {
+    height: 28px;
+}
+.admin-city-array .select2-container--krajee .select2-selection--multiple .select2-selection__clear {
+    margin-right: 30px;
+}
+.admin-city-array .select2-container--krajee .select2-selection--multiple .select2-selection__choice {
+    font-size: 13px; margin-top: 4px;
+    background: #0072bc;
+    color: #fff;
+}
+.admin-city-array .select2-container--krajee .select2-selection--multiple .select2-selection__choice__remove {
+    text-shadow: none;
+    margin-top: 3px;
+    color: #fff;
+    opacity: 1;
+}
+.input-blocks.admin-project-list.admin-currency-second {
+    margin-left: 0;
+    padding-top: 0;
+}
+.input-blocks.admin-project-list.admin-currency-second select {width: 100%}
+.input-blocks.admin-project-list-two.admin-currency-second {
+    margin-left:0;
+    padding-top: 18px;
+    width: 80px;
+}
+.input-blocks.admin-project-list-two.admin-currency-first {
+    width: 76px;
+}
+.input-blocks.admin-project-list-two.admin-currency-first input{margin-left: 0 !important;}
+.admin-project-contractual {
+    margin-top: 29px;
+}
+input[disabled], select[disabled] {
+    cursor: default;
+    background: #f1f1f1;
 }
 \ No newline at end of file