Commit 3364fb6a79c6966404205cd213ac7d63fdf2811c
1 parent
a82865e3
tokar commit
Showing
6 changed files
with
360 additions
and
119 deletions
Show diff stats
backend/web/js/option.js
| @@ -20,7 +20,6 @@ function checkboxerInit() { | @@ -20,7 +20,6 @@ function checkboxerInit() { | ||
| 20 | 20 | ||
| 21 | function accountRedraw() { | 21 | function accountRedraw() { |
| 22 | var type = $('input[name="User[type]"]:checked').val(); | 22 | var type = $('input[name="User[type]"]:checked').val(); |
| 23 | - console.log(type); | ||
| 24 | if(type == 2) { | 23 | if(type == 2) { |
| 25 | $('#form_definition').removeClass('form_for_company'); | 24 | $('#form_definition').removeClass('form_for_company'); |
| 26 | } else { | 25 | } else { |
common/models/User.php
| @@ -62,6 +62,7 @@ class User extends ActiveRecord implements IdentityInterface, UserRbacInterface | @@ -62,6 +62,7 @@ class User extends ActiveRecord implements IdentityInterface, UserRbacInterface | ||
| 62 | ['status', 'default', 'value' => self::STATUS_ACTIVE], | 62 | ['status', 'default', 'value' => self::STATUS_ACTIVE], |
| 63 | ['status', 'in', 'range' => [self::STATUS_ACTIVE, self::STATUS_DELETED]], | 63 | ['status', 'in', 'range' => [self::STATUS_ACTIVE, self::STATUS_DELETED]], |
| 64 | [['username', 'lastname', 'firstname', 'middlename'], 'string', 'max' => 255], | 64 | [['username', 'lastname', 'firstname', 'middlename'], 'string', 'max' => 255], |
| 65 | + [['firstname'], 'required'], | ||
| 65 | [['type'], 'in', 'range' => [1, 2]], | 66 | [['type'], 'in', 'range' => [1, 2]], |
| 66 | [['type'], 'default', 'value' => '1',], | 67 | [['type'], 'default', 'value' => '1',], |
| 67 | ]; | 68 | ]; |
common/widgets/views/image_sizer.php
| @@ -12,25 +12,33 @@ $id = $model::tableName().'_id'; | @@ -12,25 +12,33 @@ $id = $model::tableName().'_id'; | ||
| 12 | ?> | 12 | ?> |
| 13 | <div class="file-uploader-block"> | 13 | <div class="file-uploader-block"> |
| 14 | <?php if(!$multi):?> | 14 | <?php if(!$multi):?> |
| 15 | - <span class="btn btn-success fileinput-button uploader-button"> | ||
| 16 | - <i class="glyphicon glyphicon-plus"></i> | ||
| 17 | - <span><?=$name?></span> | ||
| 18 | 15 | ||
| 19 | - <?= Html::activeFileInput( new \common\models\ImageSizerForm(),'file',['id'=>$field, 'data-url'=>Yii::$app->getUrlManager()->createUrl('file/uploader/download-photo')]);?> | ||
| 20 | - </span> | ||
| 21 | 16 | ||
| 22 | <?= Html::activeHiddenInput( $model,$field,['id' => "{$field}_picture_link"]) ?> | 17 | <?= Html::activeHiddenInput( $model,$field,['id' => "{$field}_picture_link"]) ?> |
| 23 | <input type="hidden" id="<?=$field?>_old_img" name="ImageSizerForm[old_img]" value="<?=$model->$field?>"/> | 18 | <input type="hidden" id="<?=$field?>_old_img" name="ImageSizerForm[old_img]" value="<?=$model->$field?>"/> |
| 24 | <input type="hidden" id="<?=$field?>_new_img" name="ImageSizerForm[new_img]" value=""/> | 19 | <input type="hidden" id="<?=$field?>_new_img" name="ImageSizerForm[new_img]" value=""/> |
| 25 | <input type="hidden" id="<?=$field?>_row_id" name="ImageSizerForm[new_img]" value="<?=$model->$id?>"/> | 20 | <input type="hidden" id="<?=$field?>_row_id" name="ImageSizerForm[new_img]" value="<?=$model->$id?>"/> |
| 26 | - <div id="<?= $field?>_img_block"> | ||
| 27 | - <?= $model->$field ? Html::img($model->$field): '' ?> | ||
| 28 | - </div> | 21 | + <div class="tst"> |
| 22 | + <div id="<?= $field?>_img_block" class="admin-avatar-pattern-wr"> | ||
| 23 | + <div class="admin-avatar-pattern"> | ||
| 24 | + <?= $model->$field ? Html::img($model->$field): '' ?> | ||
| 25 | + </div> | ||
| 26 | + </div> | ||
| 27 | + <div class="file-help-1"><div>Формат: PNG, JPG, GIF<br />Размер: 180x180 px<br />Файлы большего размера и других пропорций будут конвертироваться</div></div> | ||
| 28 | + </div> | ||
| 29 | + | ||
| 30 | + <span class="btn btn-success fileinput-button uploader-button"> | ||
| 31 | +<!-- <i class="glyphicon glyphicon-plus"></i>--> | ||
| 32 | + <span><?=$name?></span> | ||
| 33 | + | ||
| 34 | + <?= Html::activeFileInput( new \common\models\ImageSizerForm(),'file',['id'=>$field, 'data-url'=>Yii::$app->getUrlManager()->createUrl('file/uploader/download-photo')]);?> | ||
| 35 | + </span> | ||
| 29 | 36 | ||
| 30 | <script> | 37 | <script> |
| 31 | $(function(){ | 38 | $(function(){ |
| 32 | 39 | ||
| 33 | $("#<?= $field?>").fileupload({ | 40 | $("#<?= $field?>").fileupload({ |
| 41 | + | ||
| 34 | dataType: 'json', | 42 | dataType: 'json', |
| 35 | formData: {width: <?=$width?>,height:<?=$height?>}, | 43 | formData: {width: <?=$width?>,height:<?=$height?>}, |
| 36 | done: function (e, data) { | 44 | done: function (e, data) { |
| @@ -38,12 +46,12 @@ $id = $model::tableName().'_id'; | @@ -38,12 +46,12 @@ $id = $model::tableName().'_id'; | ||
| 38 | $("#<?=$field?>_buttons_block").remove() | 46 | $("#<?=$field?>_buttons_block").remove() |
| 39 | } | 47 | } |
| 40 | var host = window.location.host.toString(); | 48 | var host = window.location.host.toString(); |
| 41 | - var img = '<img src="http://'+host+data.result.link+'">'+ | 49 | + 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>'+ |
| 42 | '<div id="<?=$field?>_buttons_block">'+ | 50 | '<div id="<?=$field?>_buttons_block">'+ |
| 43 | '<button type="button" id="<?=$field?>_save_img" class="btn btn-success img-action-buttons" >Сохранить</button>'+ | 51 | '<button type="button" id="<?=$field?>_save_img" class="btn btn-success img-action-buttons" >Сохранить</button>'+ |
| 44 | '<button type="button" id="<?=$field?>_remove_img" class="btn btn-danger img-action-buttons" >Отмена</button>'+ | 52 | '<button type="button" id="<?=$field?>_remove_img" class="btn btn-danger img-action-buttons" >Отмена</button>'+ |
| 45 | '</div>'; | 53 | '</div>'; |
| 46 | - var block = $("#<?= $field?>_img_block"); | 54 | + var block = $("#<?= $field?>_img_block .admin-avatar-pattern"); |
| 47 | block.find('img').remove(); | 55 | block.find('img').remove(); |
| 48 | block.append(img); | 56 | block.append(img); |
| 49 | $("#<?=$field?>_picture_link").val(data.result.link); | 57 | $("#<?=$field?>_picture_link").val(data.result.link); |
| @@ -64,13 +72,18 @@ $id = $model::tableName().'_id'; | @@ -64,13 +72,18 @@ $id = $model::tableName().'_id'; | ||
| 64 | 72 | ||
| 65 | $('body').on('click', '#<?=$field?>_remove_img',function(){ | 73 | $('body').on('click', '#<?=$field?>_remove_img',function(){ |
| 66 | $("#<?=$field?>_buttons_block").remove(); | 74 | $("#<?=$field?>_buttons_block").remove(); |
| 67 | - | ||
| 68 | var old_url = $('#<?=$field?>_old_img').val(); | 75 | var old_url = $('#<?=$field?>_old_img').val(); |
| 69 | var new_url = $('#<?=$field?>_new_img').val(); | 76 | var new_url = $('#<?=$field?>_new_img').val(); |
| 70 | $.post( "/file/delete-image",{old_img: new_url}, function() { | 77 | $.post( "/file/delete-image",{old_img: new_url}, function() { |
| 71 | }); | 78 | }); |
| 72 | $("#<?=$field?>_picture_link").val(old_url); | 79 | $("#<?=$field?>_picture_link").val(old_url); |
| 73 | - $('#<?= $field?>_img_block').find('img').attr('src',old_url); | 80 | + if(old_url.length<=1){ |
| 81 | + $('#<?= $field?>_img_block').find('img').remove() | ||
| 82 | + } | ||
| 83 | + else { | ||
| 84 | + $('#<?= $field?>_img_block').find('img').attr('src',old_url); | ||
| 85 | + } | ||
| 86 | + | ||
| 74 | }); | 87 | }); |
| 75 | 88 | ||
| 76 | 89 |
frontend/views/accounts/general.php
| @@ -12,6 +12,8 @@ | @@ -12,6 +12,8 @@ | ||
| 12 | use yii\helpers\Html; | 12 | use yii\helpers\Html; |
| 13 | use yii\widgets\ActiveForm; | 13 | use yii\widgets\ActiveForm; |
| 14 | use \common\widgets\MultiLangForm; | 14 | use \common\widgets\MultiLangForm; |
| 15 | + use kartik\select2\Select2; | ||
| 16 | + use yii\web\JsExpression; | ||
| 15 | 17 | ||
| 16 | $this->title = 'Учетные данные'; | 18 | $this->title = 'Учетные данные'; |
| 17 | $this->params['breadcrumbs'][] = $this->title; | 19 | $this->params['breadcrumbs'][] = $this->title; |
| @@ -75,89 +77,106 @@ | @@ -75,89 +77,106 @@ | ||
| 75 | 77 | ||
| 76 | 78 | ||
| 77 | </div> | 79 | </div> |
| 78 | - <div class="input-blocks-wrapper"> | ||
| 79 | - <div class="input-blocks"> | ||
| 80 | - <?= $form->field ($company_info, 'name', ['options' => ['class' => 'form-group company_info']]) | ||
| 81 | - ->label ('Название компании') | ||
| 82 | - ->textInput (['class'=> 'custom-input-2']); | ||
| 83 | - ?> | ||
| 84 | - </div> | ||
| 85 | - </div> | ||
| 86 | - <div class="input-blocks-wrapper"> | ||
| 87 | - <div class="input-blocks"> | ||
| 88 | - <?= $form->field ($company_info, 'staff', ['options' => ['class' => 'form-group company_info']]) | ||
| 89 | - ->label ('Количество сотрудников') | ||
| 90 | - ->textInput (['class'=> 'custom-input-2','type'=>'number']); | ||
| 91 | - ?> | 80 | + <div class="style border-general" style="margin-top: 11px"> |
| 81 | + <div class="hidden-input-admin-general"> | ||
| 82 | + <div class="input-blocks-wrapper"> | ||
| 83 | + <div class="input-blocks"> | ||
| 84 | + <?= $form->field ($company_info, 'name', ['options' => ['class' => 'form-group company_info']]) | ||
| 85 | + ->label ('Название компании') | ||
| 86 | + ->textInput (['class'=> 'custom-input-2']); | ||
| 87 | + ?> | ||
| 88 | + </div> | ||
| 89 | + </div> | ||
| 90 | + <div class="input-blocks-wrapper"> | ||
| 91 | + <div class="input-blocks"> | ||
| 92 | + <?= $form->field ($company_info, 'staff', ['options' => ['class' => 'form-group company_info']]) | ||
| 93 | + ->label ('Количество сотрудников') | ||
| 94 | + ->textInput (['class'=> 'custom-input-2','type'=>'number']); | ||
| 95 | + ?> | ||
| 96 | + </div> | ||
| 97 | + </div> | ||
| 92 | </div> | 98 | </div> |
| 93 | - </div> | ||
| 94 | 99 | ||
| 95 | - <div class="input-blocks-wrapper"> | ||
| 96 | - <div class="input-blocks"> | ||
| 97 | - <?= $form->field ($user, 'firstname') | ||
| 98 | - ->label ('Имя') | ||
| 99 | - ->textInput (['class'=> 'custom-input-2']); | ||
| 100 | - ?> | 100 | + <div class="input-blocks-wrapper"> |
| 101 | + <div class="input-blocks"> | ||
| 102 | + <?= $form->field ($user, 'firstname') | ||
| 103 | + ->label ('Имя') | ||
| 104 | + ->textInput (['class'=> 'custom-input-2']); | ||
| 105 | + ?> | ||
| 106 | + </div> | ||
| 101 | </div> | 107 | </div> |
| 102 | - </div> | ||
| 103 | 108 | ||
| 104 | - <div class="input-blocks-wrapper"> | ||
| 105 | - <div class="input-blocks"> | ||
| 106 | - <?= $form->field ($user, 'lastname') | ||
| 107 | - ->label ('Фамилия') | ||
| 108 | - ->textInput (['class'=> 'custom-input-2']); | ||
| 109 | - ?> | ||
| 110 | - </div> | ||
| 111 | - </div> | ||
| 112 | - <div class="input-blocks-wrapper"> | ||
| 113 | - <div class="input-blocks"> | ||
| 114 | - <?= $form->field ($user_info, 'country') | ||
| 115 | - ->label ('Ваша страна') | ||
| 116 | - ->textInput (['class'=> 'custom-input-2']); | ||
| 117 | - ?> | ||
| 118 | - </div> | ||
| 119 | - </div> | ||
| 120 | - <div class="input-blocks-wrapper"> | ||
| 121 | - <div class="input-blocks"> | ||
| 122 | - <?= $form->field ($user_info, 'city') | ||
| 123 | - ->label ('Ваш город') | ||
| 124 | - ->textInput (['class'=> 'custom-input-2']); | ||
| 125 | - ?> | 109 | + <div class="input-blocks-wrapper"> |
| 110 | + <div class="input-blocks"> | ||
| 111 | + <?= $form->field ($user, 'lastname') | ||
| 112 | + ->label ('Фамилия') | ||
| 113 | + ->textInput (['class'=> 'custom-input-2']); | ||
| 114 | + ?> | ||
| 115 | + </div> | ||
| 126 | </div> | 116 | </div> |
| 127 | - | ||
| 128 | - <div class="input-blocks street-input"> | ||
| 129 | - <?= $form->field ($company_info, 'street', ['options' => ['class' => 'form-group company_info']]) | ||
| 130 | - ->label ('Улица') | ||
| 131 | - ->textInput (['class'=> 'custom-input-2']); | 117 | + <div class="input-blocks-wrapper"> |
| 118 | + <div class="input-blocks"> | ||
| 119 | + <?= $form->field ($user_info, 'country') | ||
| 120 | + ->label ('Ваша страна') | ||
| 121 | + ->textInput (['class'=> 'custom-input-2']); | ||
| 132 | ?> | 122 | ?> |
| 123 | + </div> | ||
| 133 | </div> | 124 | </div> |
| 134 | - | ||
| 135 | - <div class="input-blocks home-input"> | ||
| 136 | - <?= $form->field ($company_info, 'house', ['options' => ['class' => 'form-group company_info']]) | ||
| 137 | - ->label ('Дом') | ||
| 138 | - ->textInput (['class'=> 'custom-input-2']); | 125 | + <div class="input-blocks-wrapper"> |
| 126 | + <div class="input-blocks"> | ||
| 127 | + <?= | ||
| 128 | + $form->field($user_info, 'city')->widget(Select2::classname(), [ | ||
| 129 | + 'options' => ['placeholder' => 'Выбор города ...'], | ||
| 130 | + 'pluginOptions' => [ | ||
| 131 | + 'allowClear' => true, | ||
| 132 | + 'minimumInputLength' => 3, | ||
| 133 | + 'ajax' => [ | ||
| 134 | + 'url' => \yii\helpers\Url::to(['site/city']), | ||
| 135 | + 'dataType' => 'json', | ||
| 136 | + 'data' => new JsExpression('function(params) { return {q:params.term}; }') | ||
| 137 | + ], | ||
| 138 | + 'escapeMarkup' => new JsExpression('function (markup) { return markup; }'), | ||
| 139 | + 'templateResult' => new JsExpression('function(city) { return city.text; }'), | ||
| 140 | + 'templateSelection' => new JsExpression('function (city) { return city.text; }'), | ||
| 141 | + ], | ||
| 142 | + ]); | ||
| 139 | ?> | 143 | ?> |
| 140 | - </div> | ||
| 141 | - </div> | ||
| 142 | 144 | ||
| 143 | - <div class="input-blocks-wrapper"> | ||
| 144 | - <div class="input-blocks"> | ||
| 145 | - <?= $form->field ($user, 'email') | ||
| 146 | - ->label ('Email') | ||
| 147 | - ->textInput (['class'=> 'custom-input-2','disabled' => 'disabled']); | ||
| 148 | - ?> | 145 | + </div> |
| 146 | + | ||
| 147 | + <div class="input-blocks street-input"> | ||
| 148 | + <?= $form->field ($company_info, 'street', ['options' => ['class' => 'form-group company_info']]) | ||
| 149 | + ->label ('Улица') | ||
| 150 | + ->textInput (['class'=> 'custom-input-2']); | ||
| 151 | + ?> | ||
| 152 | + </div> | ||
| 153 | + | ||
| 154 | + <div class="input-blocks home-input"> | ||
| 155 | + <?= $form->field ($company_info, 'house', ['options' => ['class' => 'form-group company_info']]) | ||
| 156 | + ->label ('Дом') | ||
| 157 | + ->textInput (['class'=> 'custom-input-2']); | ||
| 158 | + ?> | ||
| 159 | + </div> | ||
| 149 | </div> | 160 | </div> |
| 150 | - <div class="input-blocks hide-mail-check"> | ||
| 151 | - <?= $form->field ($company_info, 'hide_mail', ['options' => ['class' => 'form-group company_info', ], 'template' => "{input}{label}\n{hint}\n{error}"]) | ||
| 152 | - ->label ('<span></span>не публиковать Email') | ||
| 153 | - ->checkbox (['checked'=>'checked', 'class'=> 'custom-check'], false); | ||
| 154 | - ?> | 161 | + |
| 162 | + <div class="input-blocks-wrapper "> | ||
| 163 | + <div class="input-blocks"> | ||
| 164 | + <?= $form->field ($user, 'email') | ||
| 165 | + ->label ('Email') | ||
| 166 | + ->textInput (['class'=> 'custom-input-2']); | ||
| 167 | + ?> | ||
| 168 | + </div> | ||
| 169 | + <div class="input-blocks hide-mail-check"> | ||
| 170 | + <?= $form->field ($company_info, 'hide_mail', ['options' => ['class' => 'form-group company_info', ], 'template' => "{input}{label}\n{hint}\n{error}"]) | ||
| 171 | + ->label ('<span></span>не публиковать Email') | ||
| 172 | + ->checkbox (['checked'=>'checked', 'class'=> 'custom-check'], false); | ||
| 173 | + ?> | ||
| 174 | + </div> | ||
| 155 | </div> | 175 | </div> |
| 156 | </div> | 176 | </div> |
| 157 | - | ||
| 158 | - <div class="input-blocks-wrapper"> | ||
| 159 | - <div class="input-blocks"> | ||
| 160 | - <div class="general-who-title gen-admin-title">Кто вы:</div> | 177 | + <div class="input-blocks-wrapper border-general"> |
| 178 | + <div class="input-blocks weight-normal"> | ||
| 179 | + <div class="gen-admin-title">Статус:</div> | ||
| 161 | <?= $form->field ($user_info, 'busy') | 180 | <?= $form->field ($user_info, 'busy') |
| 162 | ->label (false) | 181 | ->label (false) |
| 163 | ->radioList ( | 182 | ->radioList ( |
| @@ -179,47 +198,67 @@ | @@ -179,47 +198,67 @@ | ||
| 179 | </div> | 198 | </div> |
| 180 | 199 | ||
| 181 | 200 | ||
| 201 | + <div class="style border-general"> | ||
| 202 | + <div class="input-blocks-wrapper admin-avatar"> | ||
| 203 | + <div class="gen-admin-title">Аватар</div> | ||
| 204 | + <?= ImageUploader::widget([ | ||
| 205 | + 'model'=> $user_info, | ||
| 206 | + 'field'=>'image', | ||
| 207 | + 'width'=>180, | ||
| 208 | + 'height'=>180, | ||
| 209 | + 'multi'=>false, | ||
| 210 | + 'gallery' =>$user_info->image, | ||
| 211 | + 'name' => 'Выбрать файл' | ||
| 212 | + ]); | ||
| 213 | + ?> | ||
| 214 | + </div> | ||
| 182 | 215 | ||
| 216 | + <div class="input-blocks-wrapper admin-avatar admin-pattern"> | ||
| 217 | + <div class="gen-admin-title">Подложка</div> | ||
| 218 | + <?= ImageUploader::widget([ | ||
| 219 | + 'model'=> $user_info, | ||
| 220 | + 'field'=>'poster', | ||
| 221 | + 'width'=>1920, | ||
| 222 | + 'height'=>600, | ||
| 223 | + 'multi'=>false, | ||
| 224 | + 'gallery' =>$user_info->poster, | ||
| 225 | + 'name' => 'Выбрать файл' | ||
| 226 | + ]); | ||
| 227 | + ?> | ||
| 228 | + </div> | ||
| 183 | 229 | ||
| 230 | + </div> | ||
| 184 | 231 | ||
| 185 | 232 | ||
| 233 | + <div class="input-blocks-wrapper"> | ||
| 234 | + <div class="input-blocks weight-normal"> | ||
| 235 | + <div class="gen-admin-title">Членство в МФП</div> | ||
| 236 | + <div class="admin-fix-mfp"> | ||
| 237 | + <?= $form->field ($user_info, 'member') | ||
| 238 | + ->label (false) | ||
| 239 | + ->radioList ([0 => 'Не хочу', 1 => 'Хочу стать'], | ||
| 240 | + [ | ||
| 241 | + 'item' => function($index, $label, $name, $checked, $value) { | ||
| 242 | + $return = '<div class="admin-who-check">'; | ||
| 243 | + $return .= '<input class="custom-radio" id="select_admin_mfp'.$value.'" type="radio" name="' . $name . '" value="' . $value . '" '.($checked ? "checked" :"").' >'; | ||
| 244 | + $return .= '<label for="select_admin_mfp'.$value.'" >'; | ||
| 245 | + $return .= '<span></span>' . ucwords($label); | ||
| 246 | + $return .= '</label>'; | ||
| 247 | + $return .= '</div>'; | ||
| 248 | + return $return; | ||
| 249 | + } | ||
| 250 | + ] | ||
| 251 | + ); | ||
| 252 | + ?> | ||
| 253 | + </div> | ||
| 254 | + <div class="admin-mfp-help">Выберите если хотите стать членом МФП и наш менеджер свяжется с Вами.</div> | ||
| 255 | + </div> | ||
| 186 | 256 | ||
| 257 | + </div> | ||
| 187 | 258 | ||
| 188 | 259 | ||
| 189 | - | ||
| 190 | - | ||
| 191 | - | ||
| 192 | - | ||
| 193 | - | ||
| 194 | - | ||
| 195 | - | ||
| 196 | - <?= $form->field ($user_info, 'member') | ||
| 197 | - ->label ('Членство в МФП') | ||
| 198 | - ->hint ('Выберите если хотите стать членом МФП и наш менеджер свяжется с Вами.') | ||
| 199 | - ->radioList ([0 => 'Не хочу', 1 => 'Хочу стать']); | ||
| 200 | - ?> | ||
| 201 | - <?= ImageUploader::widget([ | ||
| 202 | - 'model'=> $user_info, | ||
| 203 | - 'field'=>'image', | ||
| 204 | - 'width'=>100, | ||
| 205 | - 'height'=>100, | ||
| 206 | - 'multi'=>false, | ||
| 207 | - 'gallery' =>$user_info->image, | ||
| 208 | - 'name' => 'Загрузить аватар' | ||
| 209 | - ]); | ||
| 210 | - ?> | ||
| 211 | - <?= ImageUploader::widget([ | ||
| 212 | - 'model'=> $user_info, | ||
| 213 | - 'field'=>'poster', | ||
| 214 | - 'width'=>1200, | ||
| 215 | - 'height'=>600, | ||
| 216 | - 'multi'=>false, | ||
| 217 | - 'gallery' =>$user_info->poster, | ||
| 218 | - 'name' => 'Загрузить постер' | ||
| 219 | - ]); | ||
| 220 | - ?> | ||
| 221 | <div class="input-blocks-wrapper"> | 260 | <div class="input-blocks-wrapper"> |
| 222 | - <div class="input-blocks"> | 261 | + <div class="admin-save-btn style"> |
| 223 | <?= Html::submitButton('Обновить', ['class' => 'input-blocks-wrapper button']); | 262 | <?= Html::submitButton('Обновить', ['class' => 'input-blocks-wrapper button']); |
| 224 | $form->end (); | 263 | $form->end (); |
| 225 | ?> | 264 | ?> |
frontend/web/css/style.css
| @@ -4612,7 +4612,8 @@ input.custom-radio + label, input.custom-check + label { | @@ -4612,7 +4612,8 @@ input.custom-radio + label, input.custom-check + label { | ||
| 4612 | } | 4612 | } |
| 4613 | input.custom-radio:checked + label, input.custom-check:checked + label { | 4613 | input.custom-radio:checked + label, input.custom-check:checked + label { |
| 4614 | color: #0072bc; | 4614 | color: #0072bc; |
| 4615 | - border-bottom: 1px solid #0072bc; | 4615 | + /*border-bottom: 1px solid #0072bc;*/ |
| 4616 | + border:none !important; | ||
| 4616 | } | 4617 | } |
| 4617 | input.custom-radio + label span, input.custom-check + label span { | 4618 | input.custom-radio + label span, input.custom-check + label span { |
| 4618 | margin-top: 2px; | 4619 | margin-top: 2px; |
| @@ -4626,6 +4627,7 @@ input.custom-radio + label span { | @@ -4626,6 +4627,7 @@ input.custom-radio + label span { | ||
| 4626 | input.custom-radio:checked + label span, input.custom-radio:checked + label:hover span { | 4627 | input.custom-radio:checked + label span, input.custom-radio:checked + label:hover span { |
| 4627 | background: url(/images/sets-ico/radio.png) no-repeat;transition: .2s; | 4628 | background: url(/images/sets-ico/radio.png) no-repeat;transition: .2s; |
| 4628 | } | 4629 | } |
| 4630 | +input.custom-radio + label:hover{ border-bottom: 1px solid #333;} | ||
| 4629 | input.custom-check + label span { | 4631 | input.custom-check + label span { |
| 4630 | width: 12px; | 4632 | width: 12px; |
| 4631 | height: 12px; | 4633 | height: 12px; |
| @@ -5158,4 +5160,191 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last- | @@ -5158,4 +5160,191 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last- | ||
| 5158 | margin-left: 20px; | 5160 | margin-left: 20px; |
| 5159 | margin-top: 5px; | 5161 | margin-top: 5px; |
| 5160 | } | 5162 | } |
| 5161 | -.custom-input-2[disabled="disabled"] {background: #f1f1f1} | ||
| 5162 | \ No newline at end of file | 5163 | \ No newline at end of file |
| 5164 | +.custom-input-2[disabled="disabled"] {background: #f1f1f1} | ||
| 5165 | +.weight-normal {width: 100%} | ||
| 5166 | +.weight-normal label {font-weight: normal} | ||
| 5167 | +.admin-mfp-help { | ||
| 5168 | + font-size: 13px; | ||
| 5169 | + color: #b7b7b7; | ||
| 5170 | + float: left; | ||
| 5171 | + margin-left: 19px; | ||
| 5172 | + line-height: 18px; | ||
| 5173 | + margin-top: 31px; | ||
| 5174 | +} | ||
| 5175 | +.admin-fix-mfp {float: left} | ||
| 5176 | +.admin-fix-mfp .admin-who-check {width: auto; float: none; max-width: 240px} | ||
| 5177 | +.admin-avatar .admin-avatar-pattern-wr{ | ||
| 5178 | + width: 180px; | ||
| 5179 | + float: left; | ||
| 5180 | +} | ||
| 5181 | +.admin-avatar .admin-avatar-pattern{ | ||
| 5182 | + width: 180px; | ||
| 5183 | + height: 180px; | ||
| 5184 | + float: left; | ||
| 5185 | + background: #f1f1f1 url("/images/avatar-bg.png") 50% 50% no-repeat; | ||
| 5186 | +} | ||
| 5187 | +.admin-avatar .admin-avatar-pattern img{ | ||
| 5188 | + width: 100% !important; | ||
| 5189 | + height: 100% !important; } | ||
| 5190 | +.admin-avatar .tst{ | ||
| 5191 | + width: 100%; | ||
| 5192 | + height: 180px; | ||
| 5193 | + float: left; | ||
| 5194 | +} | ||
| 5195 | +.file-help-1 { | ||
| 5196 | + width: 520px; | ||
| 5197 | + float: right; | ||
| 5198 | + height: 180px; | ||
| 5199 | +} | ||
| 5200 | +.file-help-1 div { | ||
| 5201 | + width: 520px; | ||
| 5202 | + height: 180px; | ||
| 5203 | + font-size: 13px; | ||
| 5204 | + color: #b7b7b7; | ||
| 5205 | + display: table-cell; | ||
| 5206 | + vertical-align: middle; | ||
| 5207 | + line-height: 16px; | ||
| 5208 | +} | ||
| 5209 | +.admin-avatar .btn{ | ||
| 5210 | + background: #fff; | ||
| 5211 | + color: #0072bc; | ||
| 5212 | + height: 29px; | ||
| 5213 | + border: 1px solid #0072bc; | ||
| 5214 | + padding: 0; | ||
| 5215 | + width: 160px; | ||
| 5216 | + line-height: 29px; | ||
| 5217 | + font-size: 13px; | ||
| 5218 | + text-align: center; | ||
| 5219 | + margin-left: 10px; | ||
| 5220 | + margin-top: 15px; | ||
| 5221 | + float: left; | ||
| 5222 | +} | ||
| 5223 | +.admin-avatar .btn:hover {background: #0072bc;color: #fff;transition: 0.2s;} | ||
| 5224 | +.admin-avatar .btn:focus {background: #00568e;transition: 0s;} | ||
| 5225 | +.admin-avatar #image_buttons_block { | ||
| 5226 | + position: absolute; | ||
| 5227 | + height: 29px; | ||
| 5228 | + float: left; | ||
| 5229 | + top: 220px; | ||
| 5230 | + left: 170px; | ||
| 5231 | +} | ||
| 5232 | +.admin-avatar #image_buttons_block .btn {margin-top: 0} | ||
| 5233 | +.admin-avatar .admin-ava-wr { | ||
| 5234 | + background: #fff; | ||
| 5235 | + width: 180px; | ||
| 5236 | + height: 180px; | ||
| 5237 | + display: table-cell; | ||
| 5238 | + vertical-align: middle; | ||
| 5239 | + text-align: center;} | ||
| 5240 | + | ||
| 5241 | + | ||
| 5242 | +.admin-pattern .file-help-1 {display: none} | ||
| 5243 | +.admin-avatar.admin-pattern .admin-avatar-pattern-wr {width: 100%} | ||
| 5244 | +.admin-avatar.admin-pattern .admin-avatar-pattern { | ||
| 5245 | + background: #f1f1f1; | ||
| 5246 | + width: 100%; | ||
| 5247 | + min-height: 180px; | ||
| 5248 | +} | ||
| 5249 | +.admin-avatar.admin-pattern .admin-ava-wr { | ||
| 5250 | + width: 100%; | ||
| 5251 | + height: 100%; | ||
| 5252 | +} | ||
| 5253 | +.admin-avatar.admin-pattern .admin-avatar-pattern{height: auto; min-height: 88px} | ||
| 5254 | +.admin-avatar.admin-pattern .tst {height: auto; min-height: 88px} | ||
| 5255 | +.admin-avatar.admin-pattern .admin-avatar-pattern img { | ||
| 5256 | + height:auto !important; | ||
| 5257 | + max-width: 720px; | ||
| 5258 | +} | ||
| 5259 | +.admin-avatar.admin-pattern .admin-avatar-pattern {position: relative} | ||
| 5260 | +.admin-avatar.admin-pattern #poster_buttons_block { | ||
| 5261 | + height: 29px; | ||
| 5262 | + position: absolute; | ||
| 5263 | + bottom: -44px; | ||
| 5264 | + left: 169px; | ||
| 5265 | +} | ||
| 5266 | +.admin-avatar.admin-pattern #poster_buttons_block .btn {margin-top: 0} | ||
| 5267 | +.admin-avatar .gen-admin-title {font-size: 13px; font-weight: 700; margin-bottom: 10px} | ||
| 5268 | +.input-blocks-wrapper.admin-avatar{margin-top: 26px} | ||
| 5269 | +.input-blocks-wrapper.admin-avatar.admin-pattern{margin-top: 19px} | ||
| 5270 | +.hidden-input-admin-general .input-blocks-wrapper:first-child{margin-top: 11px} | ||
| 5271 | +.form_for_company .hidden-input-admin-general{display: none} | ||
| 5272 | +.admin-save-btn { | ||
| 5273 | + width: 100%; | ||
| 5274 | + height: 29px; | ||
| 5275 | + text-align: center; | ||
| 5276 | + margin-bottom: 50px; | ||
| 5277 | +} | ||
| 5278 | +.admin-save-btn button { | ||
| 5279 | + width: 160px; | ||
| 5280 | + height: 29px; | ||
| 5281 | + color: #fff; | ||
| 5282 | + background: #0072bc; | ||
| 5283 | + border: 1px solid #0072bc; | ||
| 5284 | + font-size: 13px; | ||
| 5285 | + line-height: 29px; | ||
| 5286 | + margin-top: 0 !important; | ||
| 5287 | + float: none; | ||
| 5288 | + outline: none; | ||
| 5289 | + border-radius: 4px; | ||
| 5290 | +} | ||
| 5291 | +.admin-save-btn button:hover{ | ||
| 5292 | + background: #fff; | ||
| 5293 | + color: #0072bc; | ||
| 5294 | + transition: 0.2s; | ||
| 5295 | +} | ||
| 5296 | +.admin-save-btn button:focus{background: #00568e;color: #fff;} | ||
| 5297 | +/*select-new*/ | ||
| 5298 | +.select2-container--krajee .select2-selection--single { | ||
| 5299 | + height: 29px; | ||
| 5300 | + border-radius: 0; | ||
| 5301 | + padding: 0 0 0 8px; | ||
| 5302 | + line-height: 29px; | ||
| 5303 | +} | ||
| 5304 | +.select2-container--krajee .select2-selection--single .select2-selection__arrow { | ||
| 5305 | + height: 27px; | ||
| 5306 | + width: 25px; | ||
| 5307 | + background: url("/images/sets-ico/select-arrow.jpg") no-repeat !important; | ||
| 5308 | + border-left: none; | ||
| 5309 | + border-top-right-radius: 0; | ||
| 5310 | + border-bottom-right-radius: 0; | ||
| 5311 | +} | ||
| 5312 | +.select2-container--krajee.select2-container--open .select2-selection--single .select2-selection__arrow{ background: url("/images/sets-ico/select-arrow-up.png") no-repeat !important;} | ||
| 5313 | +.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} | ||
| 5314 | + | ||
| 5315 | +.select2-container--krajee {margin-top: 5px} | ||
| 5316 | +.select2-container--krajee .select2-selection--single .select2-selection__rendered {height: 27px} | ||
| 5317 | +.select2-container--krajee li.select2-results__option { | ||
| 5318 | + background: #0072bc; | ||
| 5319 | + color: #fff; | ||
| 5320 | + font-size: 13px; | ||
| 5321 | +} | ||
| 5322 | +.select2-container--krajee .select2-search--dropdown .select2-search__field {border-radius: 0} | ||
| 5323 | +.select2-container--krajee .select2-dropdown {margin-top: -6px} | ||
| 5324 | +.has-success.select2-container--krajee .select2-dropdown, .has-success .select2-container--krajee .select2-selection, .select2-container--krajee .select2-dropdown { | ||
| 5325 | + border-color: #dcdcdc; | ||
| 5326 | +} | ||
| 5327 | +.select2-container--krajee .select2-search--dropdown .select2-search__field { | ||
| 5328 | + border: 1px solid #dcdcdc; | ||
| 5329 | + height: 29px; | ||
| 5330 | +} | ||
| 5331 | +.select2-container--krajee.select2-container--open .select2-selection, .select2-container--krajee .select2-selection:focus { | ||
| 5332 | + border-color: #dcdcdc; | ||
| 5333 | + box-shadow: 1px 2px 2px 0px rgba(215, 215, 215, 0.75) inset; transition: 0.1s; | ||
| 5334 | +} | ||
| 5335 | +.has-success .select2-container--open .select2-selection, .has-success .select2-container--krajee.select2-container--focus .select2-selection { | ||
| 5336 | + border-color: #dcdcdc; | ||
| 5337 | + box-shadow: none; | ||
| 5338 | +} | ||
| 5339 | + | ||
| 5340 | + | ||
| 5341 | + | ||
| 5342 | + | ||
| 5343 | + | ||
| 5344 | + | ||
| 5345 | + | ||
| 5346 | + | ||
| 5347 | + | ||
| 5348 | + | ||
| 5349 | + | ||
| 5350 | + | ||
| 5351 | +/*end-select-new*/ | ||
| 5163 | \ No newline at end of file | 5352 | \ No newline at end of file |
frontend/web/images/sets-ico/select-arrow.jpg deleted
1.39 KB