From 3364fb6a79c6966404205cd213ac7d63fdf2811c Mon Sep 17 00:00:00 2001 From: icemate Date: Mon, 8 Feb 2016 18:02:22 +0200 Subject: [PATCH] tokar commit --- backend/web/js/option.js | 1 - common/models/User.php | 1 + common/widgets/views/image_sizer.php | 37 +++++++++++++++++++++++++------------ frontend/views/accounts/general.php | 247 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------- frontend/web/css/style.css | 193 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- frontend/web/images/sets-ico/select-arrow.jpg | Bin 1419 -> 0 bytes 6 files changed, 360 insertions(+), 119 deletions(-) delete mode 100644 frontend/web/images/sets-ico/select-arrow.jpg diff --git a/backend/web/js/option.js b/backend/web/js/option.js index 782fb58..48a0b19 100755 --- a/backend/web/js/option.js +++ b/backend/web/js/option.js @@ -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 { diff --git a/common/models/User.php b/common/models/User.php index 6bbb8d0..19a92e7 100755 --- a/common/models/User.php +++ b/common/models/User.php @@ -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',], ]; diff --git a/common/widgets/views/image_sizer.php b/common/widgets/views/image_sizer.php index 09307ff..f6392e1 100755 --- a/common/widgets/views/image_sizer.php +++ b/common/widgets/views/image_sizer.php @@ -12,25 +12,33 @@ $id = $model::tableName().'_id'; ?>
- - - - $field, 'data-url'=>Yii::$app->getUrlManager()->createUrl('file/uploader/download-photo')]);?> - "{$field}_picture_link"]) ?> -
- $field ? Html::img($model->$field): '' ?> -
+
+
+
+ $field ? Html::img($model->$field): '' ?> +
+
+
Формат: PNG, JPG, GIF
Размер: 180x180 px
Файлы большего размера и других пропорций будут конвертироваться
+
+ + + + + + $field, 'data-url'=>Yii::$app->getUrlManager()->createUrl('file/uploader/download-photo')]);?> +