diff --git a/common/widgets/views/image_sizer.php b/common/widgets/views/image_sizer.php index f6392e1..e89030c 100755 --- a/common/widgets/views/image_sizer.php +++ b/common/widgets/views/image_sizer.php @@ -24,7 +24,6 @@ $id = $model::tableName().'_id'; $field ? Html::img($model->$field): '' ?> -
Формат: PNG, JPG, GIF
Размер: 180x180 px
Файлы большего размера и других пропорций будут конвертироваться
diff --git a/frontend/assets/AppAsset.php b/frontend/assets/AppAsset.php index 6c5924b..11d3f2c 100755 --- a/frontend/assets/AppAsset.php +++ b/frontend/assets/AppAsset.php @@ -19,7 +19,7 @@ class AppAsset extends AssetBundle public $css = [ 'css/style.css', '/admin/css/flags32.css', - //'https://fonts.googleapis.com/css?family=Roboto:400,700&subset=cyrillic,latin', + 'https://fonts.googleapis.com/css?family=Roboto:400,700&subset=cyrillic,latin', ]; public $js = [ '/js/script.js', diff --git a/frontend/views/accounts/general.php b/frontend/views/accounts/general.php index 7654926..3c235df 100755 --- a/frontend/views/accounts/general.php +++ b/frontend/views/accounts/general.php @@ -95,6 +95,7 @@ ?> +
Контакты представителя:
@@ -174,7 +175,7 @@
-
+
Статус:
field ($user_info, 'busy') @@ -201,6 +202,7 @@
Аватар
+
Формат: PNG, JPG, GIF
Размер: 180x180 px
Файлы большего размера и других пропорций будут конвертироваться
$user_info, 'field'=>'image', @@ -230,7 +232,7 @@
-
+
Членство в МФП
diff --git a/frontend/views/layouts/admin.php b/frontend/views/layouts/admin.php index 9084eb2..e3c6cae 100755 --- a/frontend/views/layouts/admin.php +++ b/frontend/views/layouts/admin.php @@ -60,12 +60,12 @@ $this->beginContent('@app/views/layouts/main.php'); ], [ 'label' => 'Портфолио', - 'url' => ['accounts/portfolio'], + 'url' => ['accounts/portfolio-create'], ], [ 'label' => 'Блог', - 'url' => ['accounts/'], + 'url' => ['accounts/blog-create'], ], [ 'label' => 'Галерея', diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php index a8a3c19..61ab600 100755 --- a/frontend/views/layouts/main.php +++ b/frontend/views/layouts/main.php @@ -45,11 +45,19 @@ AppAsset::register($this);
user->isGuest): ?> -
-
Профиль
- +
+ +
+ +
+ + +
+ -
+
+ +
Профиль
user->identity->email,['accounts/cabinet']) ?> diff --git a/frontend/views/site/registration.php b/frontend/views/site/registration.php index 885dc2a..991db14 100644 --- a/frontend/views/site/registration.php +++ b/frontend/views/site/registration.php @@ -93,24 +93,28 @@ field($model, 'lastname')->textInput(['class'=>'custom-input-2'])?>
+
+
+ field($model, 'location')->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; }'), + ], + ]); + ?> +
+
- field($model, 'location')->widget(Select2::classname(), [ - 'options' => ['placeholder' => 'Search for a city ...'], - '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; }'), - ], - ]); - ?> @@ -122,22 +126,24 @@
Если вашего города нет в списке, введите его.
-
- field($model, 'verifyCode')->widget(Captcha::className(), [ - 'template' => ' -
-
- - {input} +
+ field($model, 'verifyCode')->widget(Captcha::className(), [ + 'options' => ['class' => 'custom-input-2'], + 'template' => ' +
+
+ {image} +
-
-
-
- {image} +
+
+ + {input} +
-
', - ])->label(false) ?> -
+ ', + ])->label(false) ?> +
diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css index 667fa16..914f6b6 100755 --- a/frontend/web/css/style.css +++ b/frontend/web/css/style.css @@ -7,6 +7,7 @@ body { font-weight: 400; font-size: 15px; color: #333; + line-height: 1.2; } img { border: none; @@ -4911,8 +4912,8 @@ input.disabled.admin-check:checked + label, input.disabled.admin-check:checked + padding-left: 8px; } .help-block { - width: 330px; - margin-left: -20px; + width: 320px; + margin-left: -10px; text-align: center; position: relative; border: 1px solid #c1c1c1; @@ -4921,7 +4922,8 @@ input.disabled.admin-check:checked + label, input.disabled.admin-check:checked + padding: 15px 0; display: none; } -.has-error .help-block {display: block} +.input-blocks-wrapper.captcha-wr .help-block {float: left} +.has-error .help-block {display: block ;color: inherit} .help-block:before { content: ''; width: 20px; @@ -4957,7 +4959,7 @@ input.disabled.admin-check:checked + label, input.disabled.admin-check:checked + left: -15px; width: 15px; } - +.has-success label {color: inherit !important;} .input-blocks .has-success:before { } @@ -5318,6 +5320,7 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last- color: #fff; font-size: 13px; } +.select2-selection__rendered{padding-right: 23px; box-sizing: border-box} .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 { @@ -5335,16 +5338,21 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last- border-color: #dcdcdc; box-shadow: none; } +.select2-container .select2-selection--single .select2-selection__clear{margin-top: 3px;margin-right: 0} +.select2-results__option.select2-results__message {padding-right: 0 !important;} - - - - - - - - - - -/*end-select-new*/ \ No newline at end of file +.select2-selection__rendered {margin-right: 30px} +/*end-select-new*/ +.fix-marg {margin-top: 17px} +.conacts-admin { + font-size: 13px; + margin-top: 11px; + color: #b7b7b7} +.header-cabinet-profile.not-login { + margin-top: -3px; +} +.header-cabinet-profile.not-login > div {width: 116px; float: right} +.admin-avatar .file-uploader-block {width: 180px; float: left} +.admin-pattern.admin-avatar .file-uploader-block {width: 100%} +.file-help-1 {width: 520px; float: right;height: 130px} \ No newline at end of file -- libgit2 0.21.4