From 7fe508fbb9f90a5593463f34eaa32857a85392ca Mon Sep 17 00:00:00 2001
From: icemate <icemate.job@gmail.com>
Date: Wed, 17 Feb 2016 14:22:58 +0200
Subject: [PATCH] tokar commit

---
 common/widgets/views/_gallery_item.php    |   1 +
 common/widgets/views/image_sizer.php      |   2 ++
 common/widgets/views/phone_field.php      |   8 ++++----
 common/widgets/views/site_field.php       |   8 ++++----
 common/widgets/views/youtube_field.php    |  15 +++++++++++----
 frontend/views/accounts/_gallery_form.php |  41 +++++++++++++++++++++++------------------
 frontend/views/accounts/_team_form.php    | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------
 frontend/views/accounts/gallery-video.php |  42 ++++++++++++++++++++++++------------------
 frontend/views/accounts/gallery.php       |  16 ++++++++++------
 frontend/views/accounts/service.php       |   6 ------
 frontend/web/css/style.css                |  31 ++++++++++++++++++++++++++++++-
 11 files changed, 197 insertions(+), 106 deletions(-)

diff --git a/common/widgets/views/_gallery_item.php b/common/widgets/views/_gallery_item.php
index e8febd9..80da481 100755
--- a/common/widgets/views/_gallery_item.php
+++ b/common/widgets/views/_gallery_item.php
@@ -2,6 +2,7 @@
 use yii\helpers\Html;
 
 ?>
+
 <div class="gallery_image">
     <?= Html::img($item['image'])?>
     <span data-url="<?=$item['image']?>" title="удалить изображение" class="glyphicon glyphicon-trash delete-gallery-item"></span>
diff --git a/common/widgets/views/image_sizer.php b/common/widgets/views/image_sizer.php
index 6d3ed26..3c70774 100755
--- a/common/widgets/views/image_sizer.php
+++ b/common/widgets/views/image_sizer.php
@@ -61,6 +61,8 @@ $id = $model::tableName().'_id';
 
 
         $('body').on('click', '#<?=$field?>_save_img',function(){
+            $("#<?= $field?>_img_block").parent().parent().parent().removeClass('success_download')
+
             $("#<?=$field?>_buttons_block").remove();
             var old_url = $('#<?=$field?>_old_img').val();
             var new_url = $('#<?=$field?>_new_img').val();
diff --git a/common/widgets/views/phone_field.php b/common/widgets/views/phone_field.php
index 5eaf92f..09922d4 100644
--- a/common/widgets/views/phone_field.php
+++ b/common/widgets/views/phone_field.php
@@ -17,8 +17,8 @@
 
         <?= Html::beginTag('div',['class'=>'form-group','id'=>isset($model[$i]['parent_key']) ? $model[$i]['parent_key'] : 0 ])?>
         <div class="input-blocks">
-            <label for="cont-phone-<?= $label ?>">Телефон</label>
-            <input id="cont-phone-<?= ++$label  ?>" type="text" placeholder="" class="form-control custom-input-2" value="<?= isset($model[$t]['value']) ? $model[$t]['value'] : '' ?>" name="Fields[phone][<?=$row?>][0][phone]" />
+            <label for="cont-phone-<?= ++$label ?>">Телефон</label>
+            <input id="cont-phone-<?= $label  ?>" type="text" placeholder="" class="form-control custom-input-2" value="<?= isset($model[$t]['value']) ? $model[$t]['value'] : '' ?>" name="Fields[phone][<?=$row?>][0][phone]" />
         </div>
             <span data-id="<?= isset($model[$i]['parent_key']) ? $model[$i]['parent_key'] : 0 ?>" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>
         <?= Html::endTag('div')?>
@@ -39,8 +39,8 @@
             var block_id =  $(this).parent('fieldset');
             var sub_block = '<div class="form-group" >'+
                 '<div class="input-blocks">'+
-                '<label for="cont-phone-' + start_label_<?=$this->context->id?> +'">Телефон</label>'+
-                '<input id="cont-phone-' + ++start_label_<?=$this->context->id?> +'" type="text" placeholder="" class="form-control custom-input-2" value="" name="Fields[phone]['+ start_i_<?=$this->context->id?>++ +'][0][phone]" />'+
+                '<label for="cont-phone-' + ++start_label_<?=$this->context->id?> +'">Телефон</label>'+
+                '<input id="cont-phone-' + start_label_<?=$this->context->id?> +'" type="text" placeholder="" class="form-control custom-input-2" value="" name="Fields[phone]['+ start_i_<?=$this->context->id?>++ +'][0][phone]" />'+
                 '</div>'+
                 '<span class="glyphicon glyphicon-trash delete-field-item custom-remove-ico"></span>'+
                 '<div>';
diff --git a/common/widgets/views/site_field.php b/common/widgets/views/site_field.php
index f19a5ba..14043c7 100644
--- a/common/widgets/views/site_field.php
+++ b/common/widgets/views/site_field.php
@@ -18,8 +18,8 @@ use yii\helpers\Html;
 
         <?= Html::beginTag('div',['class'=>'form-group','id'=>isset($model[$i]['parent_key']) ? $model[$i]['parent_key'] : 0 ])?>
             <div class="input-blocks">
-                <label for="cont-site-<?= $label ?>">Сайт</label>
-                <input id="cont-site-<?= ++$label  ?>" type="text" placeholder="" class="form-control custom-input-2" value="<?= isset($model[$t]['value']) ? $model[$t]['value'] : '' ?>" name="Fields[site][<?=$row?>][0][site]" />
+                <label for="cont-site-<?= ++$label ?>">Сайт</label>
+                <input id="cont-site-<?= $label  ?>" type="text" placeholder="" class="form-control custom-input-2" value="<?= isset($model[$t]['value']) ? $model[$t]['value'] : '' ?>" name="Fields[site][<?=$row?>][0][site]" />
             </div>
             <span data-id="<?= isset($model[$i]['parent_key']) ? $model[$i]['parent_key'] : 0 ?>" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>
         <?= Html::endTag('div')?>
@@ -40,8 +40,8 @@ use yii\helpers\Html;
             var sub_block = '<div class="form-group" >'+
 
                 '<div class="input-blocks">'+
-                '<label for="cont-site-' + start_label_<?=$this->context->id?> +'">Сайт</label>'+
-                '<input id="cont-site-' + ++start_label_<?=$this->context->id?> +'" type="text" placeholder="" class="form-control custom-input-2" value="" name="Fields[site]['+ start_i_<?=$this->context->id?>++ +'][0][site]" />'+
+                '<label for="cont-site-' + ++start_label_<?=$this->context->id?> +'">Сайт</label>'+
+                '<input id="cont-site-' + start_label_<?=$this->context->id?> +'" type="text" placeholder="" class="form-control custom-input-2" value="" name="Fields[site]['+ start_i_<?=$this->context->id?>++ +'][0][site]" />'+
                 '</div>'+
                 '<span title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>'+
                 '<div>';
diff --git a/common/widgets/views/youtube_field.php b/common/widgets/views/youtube_field.php
index aebbbea..b30d689 100644
--- a/common/widgets/views/youtube_field.php
+++ b/common/widgets/views/youtube_field.php
@@ -4,12 +4,12 @@
 ?>
 <fieldset>
 
-    <legend>Видео с Youtube</legend>
 
     <div class="field_list">
 
 
     <?php $t = 0;
+    $label = 0; // add this var
         for($i = 1; $i <= count($model); $i++):
             $row = $i;
 
@@ -19,7 +19,10 @@
             'class' => 'form-group',
             'id'    => isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0,
         ]) ?>
-            <input type="text" placeholder="Url видео" class="form-control" value="<?= isset( $model[ $t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[youtube][<?= $row ?>][0][youtube]"/>
+        <div class="input-blocks">
+            <label for="iframe_youtube-<?= ++$label ?>">Youtube</label>
+            <input id="iframe_youtube-<?= $label  ?>" type="text" placeholder="iframe" class="form-control custom-input-2" value="<?= isset( $model[ $t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[youtube][<?= $row ?>][0][youtube]"/>
+        </div>
             <span data-id="<?= isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0 ?>" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>
             <?= Html::endTag('div') ?>
             <?php $i = ++$t; ?>
@@ -30,6 +33,7 @@
 </fieldset>
 <script>
     var start_i_<?=$this->context->id?> = <?=$i?>;
+    var start_label_<?=$this->context->id?> = <?=$label?>; // add this var
     $ (document)
         .ready (
             function ()
@@ -43,10 +47,13 @@
                             var block_id  = $ (this)
                                 .parent ('fieldset');
                             var sub_block = '<div class="form-group" >' +
-                                            '<input type="text" placeholder="Url видео" class="form-control" value="" name="Fields[youtube][' + start_i_<?=$this->context->id?>++ + '][0][youtube]" />' +
+                                            '<div class="input-blocks">'+
+                                            '<label for="iframe_youtube-' + ++start_label_<?=$this->context->id?> +'">Youtube</label>'+
+                                            '<input id="iframe_youtube-' + start_label_<?=$this->context->id?> +'" type="text" placeholder="iframe" class="form-control custom-input-2" value="" name="Fields[youtube][' + start_i_<?=$this->context->id?>++ + '][0][youtube]" />' +
+                                            '</div>'+
                                             '<span title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>' +
                                             '<div>';
-                            console.log (block);
+//                            console.log (block);
                             block.append (sub_block);
                         }
                     );
diff --git a/frontend/views/accounts/_gallery_form.php b/frontend/views/accounts/_gallery_form.php
index a8ea686..3577c86 100644
--- a/frontend/views/accounts/_gallery_form.php
+++ b/frontend/views/accounts/_gallery_form.php
@@ -9,30 +9,35 @@
     use yii\helpers\Html;
     use yii\widgets\ActiveForm;
 
-    $this->title = 'Мой профиль';
+    $this->title = 'Галерея Фото';
     $this->params[ 'breadcrumbs' ][] = $this->title;
 ?>
-<h1><?= $this->title ?></h1>
+<div class="login-left-column-title"><?= $this->title ?></div>
 
 <?php
     $form = ActiveForm::begin();
 ?>
-
-<?= $gallery->date_add ?>
-
-<?= $form->field($gallery, 'name')
-         ->textInput() ?>
-
-<?= ImageUploader::widget([
-    'model'   => $gallery,
-    'field'   => 'cover',
-    'width'   => 210,
-    'height'  => 150,
-    'multi'   => false,
-    'gallery' => $gallery->cover,
-    'name'    => 'Загрузить главное фото',
-]); ?>
-
+<div class="input-blocks-wrapper full-blocks data-block">Дата создания: <?= $gallery->date_add ?></div>
+<div class="login-left-column-title-two admin-gallery-photo-edit style">Редактирование:</div>
+
+<div class="input-blocks-wrapper">
+    <div class="input-blocks">
+        <?= $form->field($gallery, 'name')
+            ->textInput (['class'=> 'custom-input-2']) ?>
+    </div>
+</div>
+
+<div class="input-blocks-wrapper admin-avatar amin-team-foto">
+    <?= ImageUploader::widget([
+        'model'   => $gallery,
+        'field'   => 'cover',
+        'width'   => 210,
+        'height'  => 150,
+        'multi'   => false,
+        'gallery' => $gallery->cover,
+        'name'    => 'Загрузить главное фото',
+    ]); ?>
+</div>
 <?= ImageUploader::widget([
     'model'   => $gallery,
     'field'   => 'photo',
diff --git a/frontend/views/accounts/_team_form.php b/frontend/views/accounts/_team_form.php
index c790689..ddd3b2f 100644
--- a/frontend/views/accounts/_team_form.php
+++ b/frontend/views/accounts/_team_form.php
@@ -13,65 +13,108 @@
     use yii\web\JsExpression;
     use yii\widgets\ActiveForm;
 
-    $this->title = 'Мой профиль';
+    $this->title = 'Команда';
     $this->params[ 'breadcrumbs' ][] = $this->title;
 ?>
-<h1><?= $this->title ?></h1>
+<div class="login-left-column-title"><?= $this->title ?></div>
+<div class="login-left-column-title-two style">Редактирование:</div>
 
-<?php
-    $form = ActiveForm::begin();
-?>
+<div class="input-blocks-wrapper">
+    <div class="input-blocks">
+        <?php
+        $form = ActiveForm::begin();
+        ?>
+    </div>
+</div>
 
-<?= $form->field($team, 'lastname')
-         ->textInput() ?>
+<div class="input-blocks-wrapper">
+    <div class="input-blocks">
+        <?= $form->field($team, 'lastname')
+            ->textInput (['class'=> 'custom-input-2']) ?>
+    </div>
+</div>
 
-<?= $form->field($team, 'firstname')
-         ->textInput() ?>
+<div class="input-blocks-wrapper">
+    <div class="input-blocks">
+        <?= $form->field($team, 'firstname')
+            ->textInput (['class'=> 'custom-input-2']) ?>
+    </div>
+</div>
 
-<?= $form->field($team, 'middlename')
-         ->textInput() ?>
+<div class="input-blocks-wrapper">
+    <div class="input-blocks">
+        <?= $form->field($team, 'middlename')
+            ->textInput (['class'=> 'custom-input-2']) ?>
+    </div>
+</div>
 
-<?= $form->field($team, 'link')
-         ->textInput() ?>
+<div class="input-blocks-wrapper">
+    <div class="input-blocks">
+        <?= $form->field($team, 'link')
+            ->textInput (['class'=> 'custom-input-2']) ?>
+    </div>
+</div>
 
-<?= $form->field($team, 'position')
-         ->textInput() ?>
+<div class="input-blocks-wrapper">
+    <div class="input-blocks">
+        <?= $form->field($team, 'position')
+            ->textInput (['class'=> 'custom-input-2']) ?>
+    </div>
+</div>
 
-<?= $form->field($team, 'department_id')
-         ->dropDownList($department) ?>
+<div class="input-blocks-wrapper admn-select-company">
+    <div class="input-blocks">
+        <?= $form->field($team, 'department_id')
+            ->dropDownList($department) ?>
+    </div>
+</div>
 
-<?= $form->field($team, 'experience_from', [ 'template' => "{label}, с {input} года \n{hint}\n{error}" ])
-         ->input('number') ?>
+<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'])?>
+    </div>
+</div>
 
-<?=
-    $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}; }')
+<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; }'),
             ],
-            '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>
 
-<?= ImageUploader::widget([
-    'model'   => $team,
-    'field'   => 'photo',
-    'width'   => 220,
-    'height'  => 220,
-    'multi'   => false,
-    'gallery' => $team->photo,
-    'name'    => 'Загрузить фото',
-]); ?>
+<div class="input-blocks-wrapper admin-avatar amin-team-foto">
+    <?= ImageUploader::widget([
+        'model'   => $team,
+        'field'   => 'photo',
+        'width'   => 100,
+        'height'  => 100,
+        'multi'   => false,
+        'gallery' => $team->photo,
+        'name'    => 'Загрузить фото',
+    ]); ?>
+</div>
 
-<?= Html::submitButton('Добавить') ?>
+<div class="input-blocks-wrapper">
+    <div class="admin-save-btn skills-save-btn  style">
+        <?= Html::submitButton('Добавить',['class'=>'input-blocks-wrapper button']) ?>
+    </div>
+</div>
 
 <?php
     $form->end();
diff --git a/frontend/views/accounts/gallery-video.php b/frontend/views/accounts/gallery-video.php
index 61af547..a571f9d 100644
--- a/frontend/views/accounts/gallery-video.php
+++ b/frontend/views/accounts/gallery-video.php
@@ -9,24 +9,30 @@ use common\widgets\FieldEditor;
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 
-$this->title = 'Мой профиль';
+$this->title = 'Галерея Видео';
 $this->params[ 'breadcrumbs' ][] = $this->title;
 ?>
-<h1><?= $this->title ?></h1>
-
-<?php
-$form = ActiveForm::begin();
-?>
-
-<?= FieldEditor::widget (
-    [
-        'template' => 'youtube', 'item_id' => $user->id, 'model' => 'common\models\Gallery', 'language' => 'ru',
-    ]
-); ?>
-
-<?= Html::submitButton('Добавить') ?>
-
-<?php
-$form->end();
-?>
+<div class="login-left-column-title"><?= $this->title ?></div>
 
+<div class="admin-contacts-wr style">
+    <?php
+    $form = ActiveForm::begin();
+    ?>
+    <div class="input-blocks-wrapper">
+        <div class="input-blocks">
+            <?= FieldEditor::widget (
+                [
+                    'template' => 'youtube', 'item_id' => $user->id, 'model' => 'common\models\Gallery', 'language' => 'ru',
+                ]
+            ); ?>
+        </div>
+    </div>
+    <div class="input-blocks-wrapper">
+        <div class="admin-save-btn style">
+            <?= Html::submitButton('Сохранить') ?>
+        </div>
+    </div>
+    <?php
+    $form->end();
+    ?>
+</div>
diff --git a/frontend/views/accounts/gallery.php b/frontend/views/accounts/gallery.php
index 844c105..f7f5747 100755
--- a/frontend/views/accounts/gallery.php
+++ b/frontend/views/accounts/gallery.php
@@ -11,12 +11,13 @@
     $this->title = 'Галерея';
     $this->params[ 'breadcrumbs' ][] = $this->title;
 ?>
-<h1><?= $this->title ?></h1>
-<p>
+<div class="login-left-column-title"><?= $this->title ?></div>
+<div class="admin-all-pages-add">
     <?= Html::a(Yii::t('app', 'Добавить'), [ 'gallery-create' ], [ 'class' => 'btn btn-success' ]) ?>
-</p>
+</div>
+
 <?= GridView::widget([
-    'options'=>['class'=>'test'],
+    'options' => ['class'=>'style admin-all-pages-wr'],
     'dataProvider' => $dataProvider,
     'filterModel'  => $searchModel,
     'columns'      => [
@@ -49,10 +50,13 @@
             'class' => 'yii\grid\ActionColumn',
             'buttons' => [
                 'update' => function($url, $model, $key) {
-                    return Html::a('Update', ['gallery-update', 'id' => $model->gallery_id]);
+                    return Html::a('<img src="/images/ico_pencil.png" alt="">', ['gallery-update', 'id' => $model->gallery_id
+                    ],[
+                        'title'        => 'Редактировать',
+                    ]);
                 },
                 'delete' => function($url, $model, $key) {
-                    return Html::a('Delete', ['gallery-delete', 'id' => $model->gallery_id], [
+                    return Html::a('<img src="/images/delete-ico.png" alt="">', ['gallery-delete', 'id' => $model->gallery_id], [
                         'title' => 'Удалить',
                         'aria-label' => 'Удалить',
                         'data-confirm' => 'Вы уверены, что хотите удалить этот элемент?',
diff --git a/frontend/views/accounts/service.php b/frontend/views/accounts/service.php
index 471ea84..d0e4105 100755
--- a/frontend/views/accounts/service.php
+++ b/frontend/views/accounts/service.php
@@ -201,12 +201,6 @@
         </div>
     </div>
 
-
-
-
-
-
-
     <div class="input-blocks-wrapper">
         <div class="admin-save-btn style admin-save-btn-fix-line">
             <?= Html::submitButton('Сохранить') ?>
diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css
index 7978032..5ecd742 100755
--- a/frontend/web/css/style.css
+++ b/frontend/web/css/style.css
@@ -5930,4 +5930,33 @@ a {color: #0072bc}
     font-size: 13px;
     color: #0072bc;
     border-bottom: 1px dashed #0072bc;
-}
\ No newline at end of file
+}
+.input-blocks-wrapper.admn-select-company select{
+    line-height: normal;
+    padding: 0 0 0 8px;
+    outline: none;
+    border-radius: 0;
+}
+.input-blocks-wrapper.admn-select-company select:focus, .input-blocks-wrapper.admn-select-company select:active {
+    border: 1px solid #dcdcdc;
+    box-shadow: 1px 2px 2px 0px rgba(215, 215, 215, 0.75) inset;
+    transition: 0.1s;
+}
+.input-blocks-wrapper.amin-team-foto .admin-avatar-pattern{
+    background: none;
+    height: auto;
+    width: 100%;
+}
+.input-blocks-wrapper.amin-team-foto .tst{ height: auto}
+.input-blocks-wrapper.amin-team-foto .btn{margin-left: 0;}
+.input-blocks-wrapper.amin-team-foto .file-uploader-block{width: 100%}
+.input-blocks-wrapper.amin-team-foto .admin-avatar-pattern-wr{width: 100%}
+.input-blocks-wrapper.amin-team-foto #photo_buttons_block, .input-blocks-wrapper.amin-team-foto #cover_buttons_block{width: 560px; float: right}
+.input-blocks-wrapper.amin-team-foto #photo_buttons_block .btn, .input-blocks-wrapper.amin-team-foto #cover_buttons_block .btn{margin-left: 10px}
+.input-blocks-wrapper.amin-team-foto.success_download .uploader-button{margin-top: -29px}
+.input-blocks-wrapper.amin-team-foto .admin-avatar-pattern img{width: auto !important; height: auto!important;}
+.input-blocks-wrapper.amin-team-foto .admin-ava-wr{width: auto; height: auto;background: none; display: block; text-align: left}
+.admin-gallery-photo-edit {margin-top: 3px}
+
+
+
--
libgit2 0.21.4