From a81136e75636b7946f1cdce97eda291cd887f075 Mon Sep 17 00:00:00 2001
From: icemate <icemate.job@gmail.com>
Date: Thu, 18 Feb 2016 12:36:38 +0200
Subject: [PATCH] tokar commit

---
 frontend/views/accounts/_team_form.php | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------
 frontend/views/accounts/service.php    |  8 +++++++-
 frontend/web/css/style.css             | 12 ++++++++++--
 3 files changed, 78 insertions(+), 35 deletions(-)

diff --git a/frontend/views/accounts/_team_form.php b/frontend/views/accounts/_team_form.php
index cbe71cc..3e984f6 100644
--- a/frontend/views/accounts/_team_form.php
+++ b/frontend/views/accounts/_team_form.php
@@ -22,7 +22,7 @@
 <div class="input-blocks-wrapper">
     <div class="input-blocks">
         <?php
-        $form = ActiveForm::begin();
+            $form = ActiveForm::begin();
         ?>
     </div>
 </div>
@@ -30,71 +30,75 @@
 <div class="input-blocks-wrapper">
     <div class="input-blocks">
         <?= $form->field($team, 'lastname')
-            ->textInput (['class'=> 'custom-input-2']) ?>
+                 ->textInput([ 'class' => 'custom-input-2' ]) ?>
     </div>
 </div>
 
 <div class="input-blocks-wrapper">
     <div class="input-blocks">
         <?= $form->field($team, 'firstname')
-            ->textInput (['class'=> 'custom-input-2']) ?>
+                 ->textInput([ 'class' => 'custom-input-2' ]) ?>
     </div>
 </div>
 
 <div class="input-blocks-wrapper">
     <div class="input-blocks">
         <?= $form->field($team, 'middlename')
-            ->textInput (['class'=> 'custom-input-2']) ?>
+                 ->textInput([ 'class' => 'custom-input-2' ]) ?>
     </div>
 </div>
 
 <div class="input-blocks-wrapper">
     <div class="input-blocks">
         <?= $form->field($team, 'link')
-            ->textInput (['class'=> 'custom-input-2']) ?>
+                 ->textInput([ 'class' => 'custom-input-2' ]) ?>
     </div>
 </div>
 
 <div class="input-blocks-wrapper">
     <div class="input-blocks">
         <?= $form->field($team, 'position')
-            ->textInput (['class'=> 'custom-input-2']) ?>
+                 ->textInput([ 'class' => 'custom-input-2' ]) ?>
     </div>
 </div>
 
 <div class="input-blocks-wrapper admn-select-company">
     <div class="input-blocks">
         <?= $form->field($team, 'department_id')
-            ->dropDownList($department) ?>
+                 ->dropDownList($department) ?>
     </div>
 </div>
 
 <div class="input-blocks-wrapper">
     <div class="input-blocks">
         <?= $form->field($team, 'experience_from', [ 'template' => "{label},<span style='font-weight: 700;font-size: 13px'>лет</span><br /><span class='admn-input-txt' style='margin-right: 10px'>с</span>{input}<span class='admn-input-txt' style='margin-left: 10px'>года</span> \n{hint}\n{error}" ])
-            ->textInput (['class'=> 'custom-input-2 custom-input-2-date','type'=>'number', 'min' => 1950, 'max' => date('Y')])?>
+                 ->textInput([
+                     'class' => 'custom-input-2 custom-input-2-date',
+                     'type'  => 'number',
+                     'min'   => 1950,
+                     'max'   => date('Y'),
+                 ]) ?>
     </div>
 </div>
 
 <div class="input-blocks-wrapper">
     <div class="input-blocks">
-        <?=
-        $form->field($team, 'country_id')->widget(Select2::classname(), [
-            'options' => ['placeholder' => 'Выбор страны ...'],
-            'pluginOptions' => [
-                'allowClear' => true,
-                'minimumInputLength' => 3,
-                'ajax' => [
-                    'url' => \yii\helpers\Url::to(['site/country']),
-                    'dataType' => 'json',
-                    'data' => new JsExpression('function(params) { return {q:params.term}; }')
-                ],
-                'escapeMarkup' => new JsExpression('function (markup) { return markup; }'),
-                'templateResult' => new JsExpression('function(country) { return country.text; }'),
-                'templateSelection' => new JsExpression('function (country) { return country.text; }'),
-            ],
-        ]);
-        ?>
+        <?= $form->field($team, 'country_id')
+                 ->widget(Select2::classname(), [
+                     'options'       => [ 'placeholder' => 'Выбор страны ...' ],
+                     'pluginOptions' => [
+                         'allowClear'         => true,
+                         'minimumInputLength' => 3,
+                         'ajax'               => [
+                             'url'      => \yii\helpers\Url::to([ 'site/country' ]),
+                             'dataType' => 'json',
+                             'data'     => new JsExpression('function(params) { return {q:params.term}; }'),
+                         ],
+                         'escapeMarkup'       => new JsExpression('function (markup) { return markup; }'),
+                         'templateResult'     => new JsExpression('function(country) { return country.text; }'),
+                         'templateSelection'  => new JsExpression('function (country) { return country.text; }'),
+                     ],
+                 ]); ?>
     </div>
 </div>
 
@@ -111,8 +115,24 @@
 </div>
 
 <div class="input-blocks-wrapper">
-    <div class="admin-save-btn skills-save-btn  style">
-        <?= Html::submitButton('Добавить',['class'=>'input-blocks-wrapper button']) ?>
+    <div class="admin-save-btn skills-save-btn style">
+        <?= Html::submitButton('Добавить', [ 'class' => 'input-blocks-wrapper button' ]) ?>
+        <?php
+            if(!$team->isNewRecord) {
+                echo Html::a('Удалить', [
+                    'accounts/team-delete',
+                    'id' => $team->team_id,
+                ], [
+                    'title'        => 'Удалить',
+                    'aria-label'   => 'Удалить',
+                    'data-confirm' => 'Вы уверены, что хотите удалить этот элемент?',
+                    'data-method'  => 'post',
+                    'data-pjax'    => 0,
+                    'class'=>'btn'
+                ]);
+            }
+        ?>
+        <?= Html::a('Отменить', [ 'accounts/team' ]) ?>
     </div>
 </div>
 
@@ -120,9 +140,18 @@
     $form->end();
 ?>
 <script>
-    $(document).ready(function(){
-        $('.input-blocks-wrapper.admn-select-company select').change(function(){
-            $(this).blur()
-        })
-    })
+    $ (document)
+        .ready (
+            function ()
+            {
+                $ ('.input-blocks-wrapper.admn-select-company select')
+                    .change (
+                        function ()
+                        {
+                            $ (this)
+                                .blur ()
+                        }
+                    )
+            }
+        )
 </script>
diff --git a/frontend/views/accounts/service.php b/frontend/views/accounts/service.php
index 6c2e22c..81f2d29 100755
--- a/frontend/views/accounts/service.php
+++ b/frontend/views/accounts/service.php
@@ -249,4 +249,10 @@
     <?php
         $form->end();
     ?>
-</div>
\ No newline at end of file
+</div><script>
+    $(document).ready(function(){
+        $('.input-blocks.admin-currency-second select').change(function(){
+            $(this).blur()
+        })
+    })
+</script>
\ No newline at end of file
diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css
index 4efe1dd..1b24314 100755
--- a/frontend/web/css/style.css
+++ b/frontend/web/css/style.css
@@ -6016,11 +6016,19 @@ a {color: #0072bc}
     }
 }
 .input-blocks.admin-currency-first .custom-input-2.custom-input-2-date {width: 66px}
-.input-blocks.admin-currency-first {width: 150px}
-.input-blocks.admin-currency-second {}
+.input-blocks.admin-currency-first {width: 150px; position: }
+.input-blocks.admin-currency-second {
+    margin-left: -61px;
+    box-sizing: border-box;
+    padding-top: 23px;
+}
 .input-blocks.admin-currency-second select {
     border-radius: 0;
     line-height: normal;
+    width: 150px;
+    float: left;
+
+
 }
 .input-blocks.admin-currency-second select:focus{
     box-shadow: 1px 2px 2px 0px rgba(215, 215, 215, 0.75) inset;
--
libgit2 0.21.4