tokar commit

Виталий
1 parent a82865e3
Showing 6 changed files with 360 additions and 119 deletions Show diff stats
backend/web/js/option.js
common/models/User.php
common/widgets/views/image_sizer.php
frontend/views/accounts/general.php
frontend/web/css/style.css
frontend/web/images/sets-ico/select-arrow.jpg
@@ -20,7 +20,6 @@ function checkboxerInit() {
  
 function accountRedraw() {
     var type = $('input[name="User[type]"]:checked').val();
-    console.log(type);
     if(type == 2) {
         $('#form_definition').removeClass('form_for_company');
     } else {
@@ -62,6 +62,7 @@ class User extends ActiveRecord implements IdentityInterface, UserRbacInterface
             ['status', 'default', 'value' => self::STATUS_ACTIVE],
             ['status', 'in', 'range' => [self::STATUS_ACTIVE, self::STATUS_DELETED]],
             [['username', 'lastname', 'firstname', 'middlename'], 'string', 'max' => 255],
+            [['firstname'], 'required'],
             [['type'], 'in', 'range' => [1, 2]],
             [['type'], 'default', 'value' => '1',],
         ];
@@ -12,25 +12,33 @@ $id = $model::tableName().&#39;_id&#39;;
 ?>
 <div class="file-uploader-block">
     <?php if(!$multi):?>
-    <span class="btn btn-success fileinput-button uploader-button">
-        <i class="glyphicon glyphicon-plus"></i>
-        <span><?=$name?></span>
  
-        <?=  Html::activeFileInput( new \common\models\ImageSizerForm(),'file',['id'=>$field, 'data-url'=>Yii::$app->getUrlManager()->createUrl('file/uploader/download-photo')]);?>
-    </span>
  
         <?=  Html::activeHiddenInput( $model,$field,['id' => "{$field}_picture_link"]) ?>
         <input type="hidden" id="<?=$field?>_old_img" name="ImageSizerForm[old_img]" value="<?=$model->$field?>"/>
         <input type="hidden" id="<?=$field?>_new_img" name="ImageSizerForm[new_img]" value=""/>
         <input type="hidden" id="<?=$field?>_row_id" name="ImageSizerForm[new_img]" value="<?=$model->$id?>"/>
-    <div id="<?= $field?>_img_block">
-        <?= $model->$field ? Html::img($model->$field): '' ?>
-    </div>
+        <div class="tst">
+            <div id="<?= $field?>_img_block" class="admin-avatar-pattern-wr">
+                <div class="admin-avatar-pattern">
+                    <?= $model->$field ? Html::img($model->$field): '' ?>
+                </div>
+            </div>
+            <div class="file-help-1"><div>Формат: PNG, JPG, GIF<br />Размер: 180x180 px<br />Файлы большего размера и других пропорций будут конвертироваться</div></div>
+        </div>
+
+        <span class="btn btn-success fileinput-button uploader-button">
+<!--        <i class="glyphicon glyphicon-plus"></i>-->
+        <span><?=$name?></span>
+
+            <?=  Html::activeFileInput( new \common\models\ImageSizerForm(),'file',['id'=>$field, 'data-url'=>Yii::$app->getUrlManager()->createUrl('file/uploader/download-photo')]);?>
+    </span>
  
     <script>
     $(function(){
  
         $("#<?= $field?>").fileupload({
+
             dataType: 'json',
             formData: {width: <?=$width?>,height:<?=$height?>},
             done: function (e, data) {
@@ -38,12 +46,12 @@ $id = $model::tableName().&#39;_id&#39;;
                     $("#<?=$field?>_buttons_block").remove()
                 }
                 var host = window.location.host.toString();
-                var img = '<img src="http://'+host+data.result.link+'">'+
+                var img = '<div class="admin-ava-wr"><img style="vertical-align: middle; width: <?=$width?>px; height: <?=$height?>px;" src="http://'+host+data.result.link+'"></div>'+
                     '<div id="<?=$field?>_buttons_block">'+
                         '<button type="button" id="<?=$field?>_save_img" class="btn btn-success img-action-buttons" >Сохранить</button>'+
                         '<button type="button" id="<?=$field?>_remove_img" class="btn btn-danger img-action-buttons" >Отмена</button>'+
                     '</div>';
-                var block = $("#<?= $field?>_img_block");
+                var block = $("#<?= $field?>_img_block .admin-avatar-pattern");
                 block.find('img').remove();
                 block.append(img);
                 $("#<?=$field?>_picture_link").val(data.result.link);
@@ -64,13 +72,18 @@ $id = $model::tableName().&#39;_id&#39;;
  
         $('body').on('click', '#<?=$field?>_remove_img',function(){
             $("#<?=$field?>_buttons_block").remove();
-
             var old_url = $('#<?=$field?>_old_img').val();
             var new_url = $('#<?=$field?>_new_img').val();
             $.post( "/file/delete-image",{old_img: new_url},  function() {
             });
             $("#<?=$field?>_picture_link").val(old_url);
-            $('#<?= $field?>_img_block').find('img').attr('src',old_url);
+            if(old_url.length<=1){
+                $('#<?= $field?>_img_block').find('img').remove()
+            }
+            else {
+                $('#<?= $field?>_img_block').find('img').attr('src',old_url);
+            }
+
         });
  
  
@@ -12,6 +12,8 @@
     use yii\helpers\Html;
     use yii\widgets\ActiveForm;
     use \common\widgets\MultiLangForm;
+    use kartik\select2\Select2;
+    use yii\web\JsExpression;
  
     $this->title = 'Учетные данные';
     $this->params['breadcrumbs'][] = $this->title;
@@ -75,89 +77,106 @@
  
  
     </div>
-    <div class="input-blocks-wrapper">
-        <div class="input-blocks">
-        <?= $form->field ($company_info, 'name', ['options' => ['class' => 'form-group company_info']])
-                  ->label ('Название компании')
-                  ->textInput (['class'=> 'custom-input-2']);
-        ?>
-        </div>
-    </div>
-    <div class="input-blocks-wrapper">
-        <div class="input-blocks">
-        <?= $form->field ($company_info, 'staff', ['options' => ['class' => 'form-group company_info']])
-                  ->label ('Количество сотрудников')
-                  ->textInput (['class'=> 'custom-input-2','type'=>'number']);
-        ?>
+    <div class="style border-general" style="margin-top: 11px">
+        <div class="hidden-input-admin-general">
+            <div class="input-blocks-wrapper">
+                <div class="input-blocks">
+                <?= $form->field ($company_info, 'name', ['options' => ['class' => 'form-group company_info']])
+                          ->label ('Название компании')
+                          ->textInput (['class'=> 'custom-input-2']);
+                ?>
+                </div>
+            </div>
+            <div class="input-blocks-wrapper">
+                <div class="input-blocks">
+                <?= $form->field ($company_info, 'staff', ['options' => ['class' => 'form-group company_info']])
+                          ->label ('Количество сотрудников')
+                          ->textInput (['class'=> 'custom-input-2','type'=>'number']);
+                ?>
+                </div>
+            </div>
         </div>
-    </div>
  
-    <div class="input-blocks-wrapper">
-        <div class="input-blocks">
-            <?= $form->field ($user, 'firstname')
-                ->label ('Имя')
-                ->textInput (['class'=> 'custom-input-2']);
-            ?>
+        <div class="input-blocks-wrapper">
+            <div class="input-blocks">
+                <?= $form->field ($user, 'firstname')
+                    ->label ('Имя')
+                    ->textInput (['class'=> 'custom-input-2']);
+                ?>
+            </div>
         </div>
-    </div>
  
-    <div class="input-blocks-wrapper">
-        <div class="input-blocks">
-            <?= $form->field ($user, 'lastname')
-                ->label ('Фамилия')
-                ->textInput (['class'=> 'custom-input-2']);
-            ?>
-        </div>
-    </div>
-    <div class="input-blocks-wrapper">
-        <div class="input-blocks">
-        <?= $form->field ($user_info, 'country')
-                  ->label ('Ваша страна')
-                  ->textInput (['class'=> 'custom-input-2']);
-        ?>
-        </div>
-    </div>
-    <div class="input-blocks-wrapper">
-        <div class="input-blocks">
-        <?= $form->field ($user_info, 'city')
-                  ->label ('Ваш город')
-                  ->textInput (['class'=> 'custom-input-2']);
-        ?>
+        <div class="input-blocks-wrapper">
+            <div class="input-blocks">
+                <?= $form->field ($user, 'lastname')
+                    ->label ('Фамилия')
+                    ->textInput (['class'=> 'custom-input-2']);
+                ?>
+            </div>
         </div>
-
-        <div class="input-blocks street-input">
-            <?= $form->field ($company_info, 'street', ['options' => ['class' => 'form-group company_info']])
-                ->label ('Улица')
-                ->textInput (['class'=> 'custom-input-2']);
+        <div class="input-blocks-wrapper">
+            <div class="input-blocks">
+            <?= $form->field ($user_info, 'country')
+                      ->label ('Ваша страна')
+                      ->textInput (['class'=> 'custom-input-2']);
             ?>
+            </div>
         </div>
-
-        <div class="input-blocks home-input">
-            <?= $form->field ($company_info, 'house', ['options' => ['class' => 'form-group company_info']])
-                ->label ('Дом')
-                ->textInput (['class'=> 'custom-input-2']);
+        <div class="input-blocks-wrapper">
+            <div class="input-blocks">
+            <?=
+            $form->field($user_info, '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; }'),
+                ],
+            ]);
             ?>
-        </div>
-    </div>
  
-    <div class="input-blocks-wrapper">
-        <div class="input-blocks">
-        <?= $form->field ($user, 'email')
-                  ->label ('Email')
-                  ->textInput (['class'=> 'custom-input-2','disabled' => 'disabled']);
-        ?>
+            </div>
+
+            <div class="input-blocks street-input">
+                <?= $form->field ($company_info, 'street', ['options' => ['class' => 'form-group company_info']])
+                    ->label ('Улица')
+                    ->textInput (['class'=> 'custom-input-2']);
+                ?>
+            </div>
+
+            <div class="input-blocks home-input">
+                <?= $form->field ($company_info, 'house', ['options' => ['class' => 'form-group company_info']])
+                    ->label ('Дом')
+                    ->textInput (['class'=> 'custom-input-2']);
+                ?>
+            </div>
         </div>
-        <div class="input-blocks hide-mail-check">
-        <?= $form->field ($company_info, 'hide_mail', ['options' => ['class' => 'form-group company_info', ], 'template' => "{input}{label}\n{hint}\n{error}"])
-                  ->label ('<span></span>не публиковать Email')
-                  ->checkbox (['checked'=>'checked', 'class'=> 'custom-check'], false);
-        ?>
+
+        <div class="input-blocks-wrapper ">
+            <div class="input-blocks">
+            <?= $form->field ($user, 'email')
+                      ->label ('Email')
+                      ->textInput (['class'=> 'custom-input-2']);
+            ?>
+            </div>
+            <div class="input-blocks hide-mail-check">
+            <?= $form->field ($company_info, 'hide_mail', ['options' => ['class' => 'form-group company_info', ], 'template' => "{input}{label}\n{hint}\n{error}"])
+                      ->label ('<span></span>не публиковать Email')
+                      ->checkbox (['checked'=>'checked', 'class'=> 'custom-check'], false);
+            ?>
+            </div>
         </div>
     </div>
-
-    <div class="input-blocks-wrapper">
-        <div class="input-blocks">
-        <div class="general-who-title gen-admin-title">Кто вы:</div>
+    <div class="input-blocks-wrapper border-general">
+        <div class="input-blocks weight-normal">
+        <div class="gen-admin-title">Статус:</div>
         <?= $form->field ($user_info, 'busy')
                   ->label (false)
                   ->radioList (
@@ -179,47 +198,67 @@
     </div>
  
  
+    <div class="style border-general">
+        <div class="input-blocks-wrapper admin-avatar">
+            <div class="gen-admin-title">Аватар</div>
+            <?= ImageUploader::widget([
+                'model'=> $user_info,
+                'field'=>'image',
+                'width'=>180,
+                'height'=>180,
+                'multi'=>false,
+                'gallery' =>$user_info->image,
+                'name' => 'Выбрать файл'
+            ]);
+            ?>
+        </div>
  
+        <div class="input-blocks-wrapper admin-avatar admin-pattern">
+            <div class="gen-admin-title">Подложка</div>
+                <?= ImageUploader::widget([
+                    'model'=> $user_info,
+                    'field'=>'poster',
+                    'width'=>1920,
+                    'height'=>600,
+                    'multi'=>false,
+                    'gallery' =>$user_info->poster,
+                    'name' => 'Выбрать файл'
+                ]);
+                ?>
+        </div>
  
+    </div>
  
  
+    <div class="input-blocks-wrapper">
+        <div class="input-blocks weight-normal">
+            <div class="gen-admin-title">Членство в МФП</div>
+            <div class="admin-fix-mfp">
+                <?= $form->field ($user_info, 'member')
+                    ->label (false)
+                    ->radioList ([0 => 'Не хочу', 1 => 'Хочу стать'],
+                        [
+                            '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>
+            <div class="admin-mfp-help">Выберите если хотите стать членом МФП и наш менеджер свяжется с Вами.</div>
+        </div>
  
+    </div>
  
  
-
-
-
-
-
-
-
-        <?= $form->field ($user_info, 'member')
-                  ->label ('Членство в МФП')
-                  ->hint ('Выберите если хотите стать членом МФП и наш менеджер свяжется с Вами.')
-                  ->radioList ([0 => 'Не хочу', 1 => 'Хочу стать']);
-        ?>
-        <?= ImageUploader::widget([
-            'model'=> $user_info,
-            'field'=>'image',
-            'width'=>100,
-            'height'=>100,
-            'multi'=>false,
-            'gallery' =>$user_info->image,
-            'name' => 'Загрузить аватар'
-        ]);
-        ?>
-        <?= ImageUploader::widget([
-            'model'=> $user_info,
-            'field'=>'poster',
-            'width'=>1200,
-            'height'=>600,
-            'multi'=>false,
-            'gallery' =>$user_info->poster,
-            'name' => 'Загрузить постер'
-        ]);
-        ?>
     <div class="input-blocks-wrapper">
-        <div class="input-blocks">
+        <div class="admin-save-btn style">
         <?= Html::submitButton('Обновить', ['class' => 'input-blocks-wrapper button']);
         $form->end ();
         ?>
@@ -4612,7 +4612,8 @@ input.custom-radio + label, input.custom-check + label {
 }
 input.custom-radio:checked + label, input.custom-check:checked + label {
     color: #0072bc;
-    border-bottom: 1px solid #0072bc;
+    /*border-bottom: 1px solid #0072bc;*/
+    border:none !important;
 }
 input.custom-radio + label span, input.custom-check + label span {
     margin-top: 2px;
@@ -4626,6 +4627,7 @@ input.custom-radio + label span {
 input.custom-radio:checked + label span, input.custom-radio:checked + label:hover span {
     background: url(/images/sets-ico/radio.png) no-repeat;transition: .2s;
 }
+input.custom-radio + label:hover{ border-bottom: 1px solid #333;}
 input.custom-check + label span {
     width: 12px;
     height: 12px;
@@ -5158,4 +5160,191 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last-
     margin-left: 20px;
     margin-top: 5px;
 }
-.custom-input-2[disabled="disabled"] {background: #f1f1f1}
 \ No newline at end of file
+.custom-input-2[disabled="disabled"] {background: #f1f1f1}
+.weight-normal {width: 100%}
+.weight-normal label {font-weight: normal}
+.admin-mfp-help {
+    font-size: 13px;
+    color: #b7b7b7;
+    float: left;
+    margin-left: 19px;
+    line-height: 18px;
+    margin-top: 31px;
+}
+.admin-fix-mfp {float: left}
+.admin-fix-mfp .admin-who-check {width: auto; float: none; max-width: 240px}
+.admin-avatar .admin-avatar-pattern-wr{
+    width: 180px;
+    float: left;
+}
+.admin-avatar .admin-avatar-pattern{
+    width: 180px;
+    height: 180px;
+    float: left;
+    background: #f1f1f1 url("/images/avatar-bg.png") 50% 50% no-repeat;
+}
+.admin-avatar .admin-avatar-pattern img{
+    width: 100% !important;
+    height: 100% !important; }
+.admin-avatar .tst{
+    width: 100%;
+    height: 180px;
+    float: left;
+}
+.file-help-1 {
+    width: 520px;
+    float: right;
+    height: 180px;
+}
+.file-help-1 div {
+    width: 520px;
+    height: 180px;
+    font-size: 13px;
+    color: #b7b7b7;
+    display: table-cell;
+    vertical-align: middle;
+    line-height: 16px;
+}
+.admin-avatar .btn{
+    background: #fff;
+    color: #0072bc;
+    height: 29px;
+    border: 1px solid #0072bc;
+    padding: 0;
+    width: 160px;
+    line-height: 29px;
+    font-size: 13px;
+    text-align: center;
+    margin-left: 10px;
+    margin-top: 15px;
+    float: left;
+}
+.admin-avatar .btn:hover {background: #0072bc;color: #fff;transition: 0.2s;}
+.admin-avatar .btn:focus {background: #00568e;transition: 0s;}
+.admin-avatar #image_buttons_block {
+    position: absolute;
+    height: 29px;
+    float: left;
+    top: 220px;
+    left: 170px;
+}
+.admin-avatar #image_buttons_block .btn {margin-top: 0}
+.admin-avatar .admin-ava-wr {
+    background: #fff;
+    width: 180px;
+    height: 180px;
+    display: table-cell;
+    vertical-align: middle;
+    text-align: center;}
+
+
+.admin-pattern .file-help-1 {display: none}
+.admin-avatar.admin-pattern .admin-avatar-pattern-wr {width: 100%}
+.admin-avatar.admin-pattern .admin-avatar-pattern {
+    background: #f1f1f1;
+    width: 100%;
+    min-height: 180px;
+}
+.admin-avatar.admin-pattern .admin-ava-wr {
+    width: 100%;
+    height: 100%;
+}
+.admin-avatar.admin-pattern .admin-avatar-pattern{height: auto; min-height: 88px}
+.admin-avatar.admin-pattern .tst {height: auto; min-height: 88px}
+.admin-avatar.admin-pattern .admin-avatar-pattern img {
+    height:auto !important;
+    max-width: 720px;
+}
+.admin-avatar.admin-pattern .admin-avatar-pattern {position: relative}
+.admin-avatar.admin-pattern #poster_buttons_block {
+    height: 29px;
+    position: absolute;
+    bottom: -44px;
+    left: 169px;
+}
+.admin-avatar.admin-pattern #poster_buttons_block .btn {margin-top: 0}
+.admin-avatar .gen-admin-title {font-size: 13px; font-weight: 700; margin-bottom: 10px}
+.input-blocks-wrapper.admin-avatar{margin-top: 26px}
+.input-blocks-wrapper.admin-avatar.admin-pattern{margin-top: 19px}
+.hidden-input-admin-general .input-blocks-wrapper:first-child{margin-top: 11px}
+.form_for_company .hidden-input-admin-general{display: none}
+.admin-save-btn {
+    width: 100%;
+    height: 29px;
+    text-align: center;
+    margin-bottom: 50px;
+}
+.admin-save-btn button {
+    width: 160px;
+    height: 29px;
+    color: #fff;
+    background: #0072bc;
+    border: 1px solid #0072bc;
+    font-size: 13px;
+    line-height: 29px;
+    margin-top: 0 !important;
+    float: none;
+    outline: none;
+    border-radius: 4px;
+}
+.admin-save-btn button:hover{
+    background: #fff;
+    color: #0072bc;
+    transition: 0.2s;
+}
+.admin-save-btn button:focus{background: #00568e;color: #fff;}
+/*select-new*/
+.select2-container--krajee .select2-selection--single {
+    height: 29px;
+    border-radius: 0;
+    padding: 0 0 0 8px;
+    line-height: 29px;
+}
+.select2-container--krajee .select2-selection--single .select2-selection__arrow {
+    height: 27px;
+    width: 25px;
+    background: url("/images/sets-ico/select-arrow.jpg") no-repeat !important;
+    border-left: none;
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+}
+.select2-container--krajee.select2-container--open .select2-selection--single .select2-selection__arrow{ background: url("/images/sets-ico/select-arrow-up.png") no-repeat !important;}
+.select2-container--krajee .select2-selection--single .select2-selection__arrow b, .select2-container--krajee.select2-container--open .select2-selection--single .select2-selection__arrow b{display: none}
+
+.select2-container--krajee {margin-top: 5px}
+.select2-container--krajee .select2-selection--single .select2-selection__rendered {height: 27px}
+.select2-container--krajee li.select2-results__option {
+    background: #0072bc;
+    color: #fff;
+    font-size: 13px;
+}
+.select2-container--krajee .select2-search--dropdown .select2-search__field {border-radius: 0}
+.select2-container--krajee .select2-dropdown {margin-top: -6px}
+.has-success.select2-container--krajee .select2-dropdown, .has-success .select2-container--krajee .select2-selection, .select2-container--krajee .select2-dropdown {
+    border-color: #dcdcdc;
+}
+.select2-container--krajee .select2-search--dropdown .select2-search__field {
+    border: 1px solid #dcdcdc;
+    height: 29px;
+}
+.select2-container--krajee.select2-container--open .select2-selection, .select2-container--krajee .select2-selection:focus {
+    border-color: #dcdcdc;
+    box-shadow: 1px 2px 2px 0px rgba(215, 215, 215, 0.75) inset; transition: 0.1s;
+}
+.has-success .select2-container--open .select2-selection, .has-success .select2-container--krajee.select2-container--focus .select2-selection {
+    border-color: #dcdcdc;
+    box-shadow: none;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+/*end-select-new*/
 \ No newline at end of file