Commit fe41f4edb5049e977d5ee411f0163edabe8df7ae
1 parent
84ebac3d
tokar commit
Showing
7 changed files
with
79 additions
and
56 deletions
Show diff stats
common/widgets/views/image_sizer.php
| @@ -24,7 +24,6 @@ $id = $model::tableName().'_id'; | @@ -24,7 +24,6 @@ $id = $model::tableName().'_id'; | ||
| 24 | <?= $model->$field ? Html::img($model->$field): '' ?> | 24 | <?= $model->$field ? Html::img($model->$field): '' ?> |
| 25 | </div> | 25 | </div> |
| 26 | </div> | 26 | </div> |
| 27 | - <div class="file-help-1"><div>Формат: PNG, JPG, GIF<br />Размер: 180x180 px<br />Файлы большего размера и других пропорций будут конвертироваться</div></div> | ||
| 28 | </div> | 27 | </div> |
| 29 | 28 | ||
| 30 | <span class="btn btn-success fileinput-button uploader-button"> | 29 | <span class="btn btn-success fileinput-button uploader-button"> |
frontend/assets/AppAsset.php
| @@ -19,7 +19,7 @@ class AppAsset extends AssetBundle | @@ -19,7 +19,7 @@ class AppAsset extends AssetBundle | ||
| 19 | public $css = [ | 19 | public $css = [ |
| 20 | 'css/style.css', | 20 | 'css/style.css', |
| 21 | '/admin/css/flags32.css', | 21 | '/admin/css/flags32.css', |
| 22 | - //'https://fonts.googleapis.com/css?family=Roboto:400,700&subset=cyrillic,latin', | 22 | + 'https://fonts.googleapis.com/css?family=Roboto:400,700&subset=cyrillic,latin', |
| 23 | ]; | 23 | ]; |
| 24 | public $js = [ | 24 | public $js = [ |
| 25 | '/js/script.js', | 25 | '/js/script.js', |
frontend/views/accounts/general.php
| @@ -95,6 +95,7 @@ | @@ -95,6 +95,7 @@ | ||
| 95 | ?> | 95 | ?> |
| 96 | </div> | 96 | </div> |
| 97 | </div> | 97 | </div> |
| 98 | + <div class="conacts-admin style">Контакты представителя:</div> | ||
| 98 | </div> | 99 | </div> |
| 99 | 100 | ||
| 100 | <div class="input-blocks-wrapper"> | 101 | <div class="input-blocks-wrapper"> |
| @@ -174,7 +175,7 @@ | @@ -174,7 +175,7 @@ | ||
| 174 | </div> | 175 | </div> |
| 175 | </div> | 176 | </div> |
| 176 | </div> | 177 | </div> |
| 177 | - <div class="input-blocks-wrapper border-general"> | 178 | + <div class="input-blocks-wrapper border-general fix-marg"> |
| 178 | <div class="input-blocks weight-normal"> | 179 | <div class="input-blocks weight-normal"> |
| 179 | <div class="gen-admin-title">Статус:</div> | 180 | <div class="gen-admin-title">Статус:</div> |
| 180 | <?= $form->field ($user_info, 'busy') | 181 | <?= $form->field ($user_info, 'busy') |
| @@ -201,6 +202,7 @@ | @@ -201,6 +202,7 @@ | ||
| 201 | <div class="style border-general"> | 202 | <div class="style border-general"> |
| 202 | <div class="input-blocks-wrapper admin-avatar"> | 203 | <div class="input-blocks-wrapper admin-avatar"> |
| 203 | <div class="gen-admin-title">Аватар</div> | 204 | <div class="gen-admin-title">Аватар</div> |
| 205 | + <div class="file-help-1"><div>Формат: PNG, JPG, GIF<br />Размер: 180x180 px<br />Файлы большего размера и других пропорций будут конвертироваться</div></div> | ||
| 204 | <?= ImageUploader::widget([ | 206 | <?= ImageUploader::widget([ |
| 205 | 'model'=> $user_info, | 207 | 'model'=> $user_info, |
| 206 | 'field'=>'image', | 208 | 'field'=>'image', |
| @@ -230,7 +232,7 @@ | @@ -230,7 +232,7 @@ | ||
| 230 | </div> | 232 | </div> |
| 231 | 233 | ||
| 232 | 234 | ||
| 233 | - <div class="input-blocks-wrapper"> | 235 | + <div class="input-blocks-wrapper fix-marg"> |
| 234 | <div class="input-blocks weight-normal"> | 236 | <div class="input-blocks weight-normal"> |
| 235 | <div class="gen-admin-title">Членство в МФП</div> | 237 | <div class="gen-admin-title">Членство в МФП</div> |
| 236 | <div class="admin-fix-mfp"> | 238 | <div class="admin-fix-mfp"> |
frontend/views/layouts/admin.php
| @@ -60,12 +60,12 @@ $this->beginContent('@app/views/layouts/main.php'); | @@ -60,12 +60,12 @@ $this->beginContent('@app/views/layouts/main.php'); | ||
| 60 | ], | 60 | ], |
| 61 | [ | 61 | [ |
| 62 | 'label' => 'Портфолио', | 62 | 'label' => 'Портфолио', |
| 63 | - 'url' => ['accounts/portfolio'], | 63 | + 'url' => ['accounts/portfolio-create'], |
| 64 | ], | 64 | ], |
| 65 | 65 | ||
| 66 | [ | 66 | [ |
| 67 | 'label' => 'Блог', | 67 | 'label' => 'Блог', |
| 68 | - 'url' => ['accounts/'], | 68 | + 'url' => ['accounts/blog-create'], |
| 69 | ], | 69 | ], |
| 70 | [ | 70 | [ |
| 71 | 'label' => 'Галерея', | 71 | 'label' => 'Галерея', |
frontend/views/layouts/main.php
| @@ -45,11 +45,19 @@ AppAsset::register($this); | @@ -45,11 +45,19 @@ AppAsset::register($this); | ||
| 45 | <div class="header-cabinet-wr"> | 45 | <div class="header-cabinet-wr"> |
| 46 | <?php | 46 | <?php |
| 47 | if (Yii::$app->user->isGuest): ?> | 47 | if (Yii::$app->user->isGuest): ?> |
| 48 | - <div class="header-cabinet-foto"><img src="/images/ded-ico.png" alt=""/></div> | ||
| 49 | - <div class="header-cabinet-profile">Профиль</div> | ||
| 50 | - <?= Html::a('Личный кабинет',['/site/login']) ?> | 48 | + <div class="header-cabinet-foto"> |
| 49 | +<!-- <img src="/images/ded-ico.png" alt=""/>--> | ||
| 50 | + </div> | ||
| 51 | + <div class="header-cabinet-profile not-login">Профиль</div> | ||
| 52 | + <div> | ||
| 53 | + <?= Html::a('Вход',['/site/login']) ?> | ||
| 54 | + <?= Html::a('Регистрация',['/site/registration']) ?> | ||
| 55 | + </div> | ||
| 56 | + | ||
| 51 | <?php else : ?> | 57 | <?php else : ?> |
| 52 | - <div class="header-cabinet-foto"><img src="/images/ded-ico.png" alt=""/></div> | 58 | + <div class="header-cabinet-foto"> |
| 59 | + <img src="/images/ded-ico.png" alt=""/> | ||
| 60 | + </div> | ||
| 53 | <div class="header-cabinet-profile">Профиль</div> | 61 | <div class="header-cabinet-profile">Профиль</div> |
| 54 | <?= Html::a(Yii::$app->user->identity->email,['accounts/cabinet']) ?> | 62 | <?= Html::a(Yii::$app->user->identity->email,['accounts/cabinet']) ?> |
| 55 | <?php endif; ?> | 63 | <?php endif; ?> |
frontend/views/site/registration.php
| @@ -93,24 +93,28 @@ | @@ -93,24 +93,28 @@ | ||
| 93 | <?= $form->field($model, 'lastname')->textInput(['class'=>'custom-input-2'])?> | 93 | <?= $form->field($model, 'lastname')->textInput(['class'=>'custom-input-2'])?> |
| 94 | </div> | 94 | </div> |
| 95 | </div> | 95 | </div> |
| 96 | + <div class="input-blocks-wrapper"> | ||
| 97 | + <div class="input-blocks"> | ||
| 98 | + <?= | ||
| 99 | + $form->field($model, 'location')->widget(Select2::classname(), [ | ||
| 100 | + 'options' => ['placeholder' => 'Выбор города ...'], | ||
| 101 | + 'pluginOptions' => [ | ||
| 102 | + 'allowClear' => true, | ||
| 103 | + 'minimumInputLength' => 3, | ||
| 104 | + 'ajax' => [ | ||
| 105 | + 'url' => \yii\helpers\Url::to(['site/city']), | ||
| 106 | + 'dataType' => 'json', | ||
| 107 | + 'data' => new JsExpression('function(params) { return {q:params.term}; }') | ||
| 108 | + ], | ||
| 109 | + 'escapeMarkup' => new JsExpression('function (markup) { return markup; }'), | ||
| 110 | + 'templateResult' => new JsExpression('function(city) { return city.text; }'), | ||
| 111 | + 'templateSelection' => new JsExpression('function (city) { return city.text; }'), | ||
| 112 | + ], | ||
| 113 | + ]); | ||
| 114 | + ?> | ||
| 115 | + </div> | ||
| 116 | + </div> | ||
| 96 | 117 | ||
| 97 | - <?= | ||
| 98 | - $form->field($model, 'location')->widget(Select2::classname(), [ | ||
| 99 | - 'options' => ['placeholder' => 'Search for a city ...'], | ||
| 100 | - 'pluginOptions' => [ | ||
| 101 | - 'allowClear' => true, | ||
| 102 | - 'minimumInputLength' => 3, | ||
| 103 | - 'ajax' => [ | ||
| 104 | - 'url' => \yii\helpers\Url::to(['site/city']), | ||
| 105 | - 'dataType' => 'json', | ||
| 106 | - 'data' => new JsExpression('function(params) { return {q:params.term}; }') | ||
| 107 | - ], | ||
| 108 | - 'escapeMarkup' => new JsExpression('function (markup) { return markup; }'), | ||
| 109 | - 'templateResult' => new JsExpression('function(city) { return city.text; }'), | ||
| 110 | - 'templateSelection' => new JsExpression('function (city) { return city.text; }'), | ||
| 111 | - ], | ||
| 112 | - ]); | ||
| 113 | - ?> | ||
| 114 | 118 | ||
| 115 | 119 | ||
| 116 | 120 | ||
| @@ -122,22 +126,24 @@ | @@ -122,22 +126,24 @@ | ||
| 122 | </div> | 126 | </div> |
| 123 | <div class="form-help-two">Если вашего города нет в списке, введите его. </div> | 127 | <div class="form-help-two">Если вашего города нет в списке, введите его. </div> |
| 124 | </div> | 128 | </div> |
| 125 | - <div class="input-blocks-wrapper"> | ||
| 126 | - <?= $form->field($model, 'verifyCode')->widget(Captcha::className(), [ | ||
| 127 | - 'template' => ' | ||
| 128 | - <div class="input-blocks-wrapper"> | ||
| 129 | - <div class="input-blocks"> | ||
| 130 | - <label for="input-txt-8">Введите проверочный код</label> | ||
| 131 | - {input} | 129 | + <div class="input-blocks-wrapper captcha-wr"> |
| 130 | + <?= $form->field($model, 'verifyCode')->widget(Captcha::className(), [ | ||
| 131 | + 'options' => ['class' => 'custom-input-2'], | ||
| 132 | + 'template' => ' | ||
| 133 | + <div class="input-blocks-wrapper captcha"> | ||
| 134 | + <div class="input-blocks-captcha"> | ||
| 135 | + {image} | ||
| 136 | + </div> | ||
| 132 | </div> | 137 | </div> |
| 133 | - </div> | ||
| 134 | - <div class="input-blocks-wrapper captcha"> | ||
| 135 | - <div class="input-blocks-captcha"> | ||
| 136 | - {image} | 138 | + <div class="input-blocks-wrapper"> |
| 139 | + <div class="input-blocks"> | ||
| 140 | + <label for="signupform-verifycode">Введите проверочный код</label> | ||
| 141 | + {input} | ||
| 142 | + </div> | ||
| 137 | </div> | 143 | </div> |
| 138 | - </div>', | ||
| 139 | - ])->label(false) ?> | ||
| 140 | - </div> | 144 | + ', |
| 145 | + ])->label(false) ?> | ||
| 146 | + </div> | ||
| 141 | <div class="input-blocks-wrapper button"> | 147 | <div class="input-blocks-wrapper button"> |
| 142 | <button type="submit" value="Submit">Зарегистрироваться</button> | 148 | <button type="submit" value="Submit">Зарегистрироваться</button> |
| 143 | </div> | 149 | </div> |
frontend/web/css/style.css
| @@ -7,6 +7,7 @@ body { | @@ -7,6 +7,7 @@ body { | ||
| 7 | font-weight: 400; | 7 | font-weight: 400; |
| 8 | font-size: 15px; | 8 | font-size: 15px; |
| 9 | color: #333; | 9 | color: #333; |
| 10 | + line-height: 1.2; | ||
| 10 | } | 11 | } |
| 11 | img { | 12 | img { |
| 12 | border: none; | 13 | border: none; |
| @@ -4911,8 +4912,8 @@ input.disabled.admin-check:checked + label, input.disabled.admin-check:checked + | @@ -4911,8 +4912,8 @@ input.disabled.admin-check:checked + label, input.disabled.admin-check:checked + | ||
| 4911 | padding-left: 8px; | 4912 | padding-left: 8px; |
| 4912 | } | 4913 | } |
| 4913 | .help-block { | 4914 | .help-block { |
| 4914 | - width: 330px; | ||
| 4915 | - margin-left: -20px; | 4915 | + width: 320px; |
| 4916 | + margin-left: -10px; | ||
| 4916 | text-align: center; | 4917 | text-align: center; |
| 4917 | position: relative; | 4918 | position: relative; |
| 4918 | border: 1px solid #c1c1c1; | 4919 | border: 1px solid #c1c1c1; |
| @@ -4921,7 +4922,8 @@ input.disabled.admin-check:checked + label, input.disabled.admin-check:checked + | @@ -4921,7 +4922,8 @@ input.disabled.admin-check:checked + label, input.disabled.admin-check:checked + | ||
| 4921 | padding: 15px 0; | 4922 | padding: 15px 0; |
| 4922 | display: none; | 4923 | display: none; |
| 4923 | } | 4924 | } |
| 4924 | -.has-error .help-block {display: block} | 4925 | +.input-blocks-wrapper.captcha-wr .help-block {float: left} |
| 4926 | +.has-error .help-block {display: block ;color: inherit} | ||
| 4925 | .help-block:before { | 4927 | .help-block:before { |
| 4926 | content: ''; | 4928 | content: ''; |
| 4927 | width: 20px; | 4929 | width: 20px; |
| @@ -4957,7 +4959,7 @@ input.disabled.admin-check:checked + label, input.disabled.admin-check:checked + | @@ -4957,7 +4959,7 @@ input.disabled.admin-check:checked + label, input.disabled.admin-check:checked + | ||
| 4957 | left: -15px; | 4959 | left: -15px; |
| 4958 | width: 15px; | 4960 | width: 15px; |
| 4959 | } | 4961 | } |
| 4960 | - | 4962 | +.has-success label {color: inherit !important;} |
| 4961 | .input-blocks .has-success:before { | 4963 | .input-blocks .has-success:before { |
| 4962 | 4964 | ||
| 4963 | } | 4965 | } |
| @@ -5318,6 +5320,7 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last- | @@ -5318,6 +5320,7 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last- | ||
| 5318 | color: #fff; | 5320 | color: #fff; |
| 5319 | font-size: 13px; | 5321 | font-size: 13px; |
| 5320 | } | 5322 | } |
| 5323 | +.select2-selection__rendered{padding-right: 23px; box-sizing: border-box} | ||
| 5321 | .select2-container--krajee .select2-search--dropdown .select2-search__field {border-radius: 0} | 5324 | .select2-container--krajee .select2-search--dropdown .select2-search__field {border-radius: 0} |
| 5322 | .select2-container--krajee .select2-dropdown {margin-top: -6px} | 5325 | .select2-container--krajee .select2-dropdown {margin-top: -6px} |
| 5323 | .has-success.select2-container--krajee .select2-dropdown, .has-success .select2-container--krajee .select2-selection, .select2-container--krajee .select2-dropdown { | 5326 | .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- | @@ -5335,16 +5338,21 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last- | ||
| 5335 | border-color: #dcdcdc; | 5338 | border-color: #dcdcdc; |
| 5336 | box-shadow: none; | 5339 | box-shadow: none; |
| 5337 | } | 5340 | } |
| 5341 | +.select2-container .select2-selection--single .select2-selection__clear{margin-top: 3px;margin-right: 0} | ||
| 5338 | 5342 | ||
| 5343 | +.select2-results__option.select2-results__message {padding-right: 0 !important;} | ||
| 5339 | 5344 | ||
| 5340 | - | ||
| 5341 | - | ||
| 5342 | - | ||
| 5343 | - | ||
| 5344 | - | ||
| 5345 | - | ||
| 5346 | - | ||
| 5347 | - | ||
| 5348 | - | ||
| 5349 | - | ||
| 5350 | -/*end-select-new*/ | ||
| 5351 | \ No newline at end of file | 5345 | \ No newline at end of file |
| 5346 | +.select2-selection__rendered {margin-right: 30px} | ||
| 5347 | +/*end-select-new*/ | ||
| 5348 | +.fix-marg {margin-top: 17px} | ||
| 5349 | +.conacts-admin { | ||
| 5350 | + font-size: 13px; | ||
| 5351 | + margin-top: 11px; | ||
| 5352 | + color: #b7b7b7} | ||
| 5353 | +.header-cabinet-profile.not-login { | ||
| 5354 | + margin-top: -3px; | ||
| 5355 | +} | ||
| 5356 | +.header-cabinet-profile.not-login > div {width: 116px; float: right} | ||
| 5357 | +.admin-avatar .file-uploader-block {width: 180px; float: left} | ||
| 5358 | +.admin-pattern.admin-avatar .file-uploader-block {width: 100%} | ||
| 5359 | +.file-help-1 {width: 520px; float: right;height: 130px} | ||
| 5352 | \ No newline at end of file | 5360 | \ No newline at end of file |