Commit a3a1f00aa77ac89172890be150c8fb455dcc49c2
1 parent
405c1458
09.02.16
Showing
3 changed files
with
23 additions
and
18 deletions
Show diff stats
composer.lock
| @@ -363,12 +363,12 @@ | @@ -363,12 +363,12 @@ | ||
| 363 | "source": { | 363 | "source": { |
| 364 | "type": "git", | 364 | "type": "git", |
| 365 | "url": "https://github.com/cebe/markdown.git", | 365 | "url": "https://github.com/cebe/markdown.git", |
| 366 | - "reference": "d7b6f46cd423174c8a86c7f816dea45008dbf454" | 366 | + "reference": "e4499350d8a94c4c693a7e784295eff7a717ae67" |
| 367 | }, | 367 | }, |
| 368 | "dist": { | 368 | "dist": { |
| 369 | "type": "zip", | 369 | "type": "zip", |
| 370 | "url": "https://api.github.com/repos/cebe/markdown/zipball/e4499350d8a94c4c693a7e784295eff7a717ae67", | 370 | "url": "https://api.github.com/repos/cebe/markdown/zipball/e4499350d8a94c4c693a7e784295eff7a717ae67", |
| 371 | - "reference": "d7b6f46cd423174c8a86c7f816dea45008dbf454", | 371 | + "reference": "e4499350d8a94c4c693a7e784295eff7a717ae67", |
| 372 | "shasum": "" | 372 | "shasum": "" |
| 373 | }, | 373 | }, |
| 374 | "require": { | 374 | "require": { |
| @@ -415,7 +415,7 @@ | @@ -415,7 +415,7 @@ | ||
| 415 | "markdown", | 415 | "markdown", |
| 416 | "markdown-extra" | 416 | "markdown-extra" |
| 417 | ], | 417 | ], |
| 418 | - "time": "2016-01-21 11:46:58" | 418 | + "time": "2016-02-09 22:09:46" |
| 419 | }, | 419 | }, |
| 420 | { | 420 | { |
| 421 | "name": "cebe/yii2-gravatar", | 421 | "name": "cebe/yii2-gravatar", |
| @@ -1177,26 +1177,26 @@ | @@ -1177,26 +1177,26 @@ | ||
| 1177 | "source": { | 1177 | "source": { |
| 1178 | "type": "git", | 1178 | "type": "git", |
| 1179 | "url": "https://github.com/yiisoft/yii2-framework.git", | 1179 | "url": "https://github.com/yiisoft/yii2-framework.git", |
| 1180 | - "reference": "7ccbfdf4cfb0ce025e27455dc3e516af23eb2800" | 1180 | + "reference": "abb6d386b71fe4d30d028c293202223311162dd2" |
| 1181 | }, | 1181 | }, |
| 1182 | "dist": { | 1182 | "dist": { |
| 1183 | "type": "zip", | 1183 | "type": "zip", |
| 1184 | - "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/1800d3840b098fc6e936852fa84b8c1b1a0a2e57", | ||
| 1185 | - "reference": "7ccbfdf4cfb0ce025e27455dc3e516af23eb2800", | 1184 | + "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/abb6d386b71fe4d30d028c293202223311162dd2", |
| 1185 | + "reference": "abb6d386b71fe4d30d028c293202223311162dd2", | ||
| 1186 | "shasum": "" | 1186 | "shasum": "" |
| 1187 | }, | 1187 | }, |
| 1188 | "require": { | 1188 | "require": { |
| 1189 | - "bower-asset/jquery": "2.1.*@stable | 1.11.*@stable", | 1189 | + "bower-asset/jquery": "2.2.*@stable | 2.1.*@stable | 1.11.*@stable", |
| 1190 | "bower-asset/jquery.inputmask": "~3.2.2", | 1190 | "bower-asset/jquery.inputmask": "~3.2.2", |
| 1191 | "bower-asset/punycode": "1.3.*", | 1191 | "bower-asset/punycode": "1.3.*", |
| 1192 | - "bower-asset/yii2-pjax": ">=2.0.1", | 1192 | + "bower-asset/yii2-pjax": "~2.0.1", |
| 1193 | "cebe/markdown": "~1.0.0 | ~1.1.0", | 1193 | "cebe/markdown": "~1.0.0 | ~1.1.0", |
| 1194 | "ext-ctype": "*", | 1194 | "ext-ctype": "*", |
| 1195 | "ext-mbstring": "*", | 1195 | "ext-mbstring": "*", |
| 1196 | "ezyang/htmlpurifier": "4.6.*", | 1196 | "ezyang/htmlpurifier": "4.6.*", |
| 1197 | "lib-pcre": "*", | 1197 | "lib-pcre": "*", |
| 1198 | "php": ">=5.4.0", | 1198 | "php": ">=5.4.0", |
| 1199 | - "yiisoft/yii2-composer": "*" | 1199 | + "yiisoft/yii2-composer": "~2.0.4" |
| 1200 | }, | 1200 | }, |
| 1201 | "bin": [ | 1201 | "bin": [ |
| 1202 | "yii" | 1202 | "yii" |
| @@ -1263,7 +1263,7 @@ | @@ -1263,7 +1263,7 @@ | ||
| 1263 | "framework", | 1263 | "framework", |
| 1264 | "yii2" | 1264 | "yii2" |
| 1265 | ], | 1265 | ], |
| 1266 | - "time": "2016-01-28 20:15:10" | 1266 | + "time": "2016-02-11 15:39:25" |
| 1267 | }, | 1267 | }, |
| 1268 | { | 1268 | { |
| 1269 | "name": "yiisoft/yii2-bootstrap", | 1269 | "name": "yiisoft/yii2-bootstrap", |
| @@ -1545,12 +1545,12 @@ | @@ -1545,12 +1545,12 @@ | ||
| 1545 | "source": { | 1545 | "source": { |
| 1546 | "type": "git", | 1546 | "type": "git", |
| 1547 | "url": "https://github.com/fzaninotto/Faker.git", | 1547 | "url": "https://github.com/fzaninotto/Faker.git", |
| 1548 | - "reference": "b312ab9d0c446971069e22a524fec01c7cddc75e" | 1548 | + "reference": "772feacf6849bf0114873e2b869bb500fccfd438" |
| 1549 | }, | 1549 | }, |
| 1550 | "dist": { | 1550 | "dist": { |
| 1551 | "type": "zip", | 1551 | "type": "zip", |
| 1552 | - "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/ff1d463edb2c74e39f4ec76f7eb99fd47b237507", | ||
| 1553 | - "reference": "b312ab9d0c446971069e22a524fec01c7cddc75e", | 1552 | + "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/772feacf6849bf0114873e2b869bb500fccfd438", |
| 1553 | + "reference": "772feacf6849bf0114873e2b869bb500fccfd438", | ||
| 1554 | "shasum": "" | 1554 | "shasum": "" |
| 1555 | }, | 1555 | }, |
| 1556 | "require": { | 1556 | "require": { |
| @@ -1587,7 +1587,7 @@ | @@ -1587,7 +1587,7 @@ | ||
| 1587 | "faker", | 1587 | "faker", |
| 1588 | "fixtures" | 1588 | "fixtures" |
| 1589 | ], | 1589 | ], |
| 1590 | - "time": "2016-02-01 17:08:46" | 1590 | + "time": "2016-02-11 12:29:31" |
| 1591 | }, | 1591 | }, |
| 1592 | { | 1592 | { |
| 1593 | "name": "phpspec/php-diff", | 1593 | "name": "phpspec/php-diff", |
frontend/views/accounts/setting.php
| @@ -24,7 +24,7 @@ | @@ -24,7 +24,7 @@ | ||
| 24 | </button> | 24 | </button> |
| 25 | <p><?= \Yii::$app->session->getFlash ('passwordupdate') ?></p> | 25 | <p><?= \Yii::$app->session->getFlash ('passwordupdate') ?></p> |
| 26 | </div> | 26 | </div> |
| 27 | - <? | 27 | + <?php |
| 28 | } | 28 | } |
| 29 | $form = ActiveForm::begin (); | 29 | $form = ActiveForm::begin (); |
| 30 | ?> | 30 | ?> |
| @@ -56,8 +56,9 @@ | @@ -56,8 +56,9 @@ | ||
| 56 | <div class="input-blocks-wrapper"> | 56 | <div class="input-blocks-wrapper"> |
| 57 | <div class="admin-save-btn skills-save-btn line-btn-fix style"> | 57 | <div class="admin-save-btn skills-save-btn line-btn-fix style"> |
| 58 | <?= Html::submitButton ('Обновить', ['class' => 'btn btn-primary']); | 58 | <?= Html::submitButton ('Обновить', ['class' => 'btn btn-primary']); |
| 59 | - $form->end (); | 59 | + |
| 60 | ?> | 60 | ?> |
| 61 | + <?php $form->end (); ?> | ||
| 61 | </div> | 62 | </div> |
| 62 | </div> | 63 | </div> |
| 63 | 64 |
frontend/views/layouts/admin.php
| @@ -68,8 +68,12 @@ $this->beginContent('@app/views/layouts/main.php'); | @@ -68,8 +68,12 @@ $this->beginContent('@app/views/layouts/main.php'); | ||
| 68 | 'url' => ['accounts/blog'], | 68 | 'url' => ['accounts/blog'], |
| 69 | ], | 69 | ], |
| 70 | [ | 70 | [ |
| 71 | - 'label' => 'Галерея', | ||
| 72 | - 'url' => ['accounts/gallery-create'], | 71 | + 'label' => 'Галерея Изображения', |
| 72 | + 'url' => ['accounts/gallery'], | ||
| 73 | + ], | ||
| 74 | + [ | ||
| 75 | + 'label' => 'Галерея Видео', | ||
| 76 | + 'url' => ['accounts/gallery-video'], | ||
| 73 | ], | 77 | ], |
| 74 | [ | 78 | [ |
| 75 | 'label' => 'Сообщения', | 79 | 'label' => 'Сообщения', |