diff --git a/.htaccess b/.htaccess
new file mode 100644
index 0000000..effc303
--- /dev/null
+++ b/.htaccess
@@ -0,0 +1,70 @@
+
+
+ Options +FollowSymlinks
+
+ RewriteEngine On
+
+
+
+
+
+ RewriteBase /
+ # deal with admin first
+ RewriteRule ^storage/(.*)?$ /storage/$1 [L,PT]
+
+ RewriteCond %{REQUEST_URI} ^/(admin)
+
+
+
+ RewriteRule ^admin/assets/(.*)$ backend/web/assets/$1 [L]
+
+ RewriteRule ^admin/css/(.*)$ backend/web/css/$1 [L]
+
+ RewriteRule ^admin/js/(.*)$ backend/web/js/$1 [L]
+
+ RewriteRule ^admin/images/(.*)$ backend/web/images/$1 [L]
+
+ RewriteRule ^admin/fonts/(.*)$ backend/web/fonts/$1 [L]
+
+
+
+
+
+ RewriteCond %{REQUEST_URI} !^/backend/web/(assets|css|js|images|fonts)/
+
+ RewriteCond %{REQUEST_URI} ^/(admin)
+
+ RewriteRule ^.*$ backend/web/index.php [L]
+
+
+
+ RewriteCond %{REQUEST_URI} ^/(assets|css)
+
+ RewriteRule ^assets/(.*)$ frontend/web/assets/$1 [L]
+
+ RewriteRule ^css/(.*)$ frontend/web/css/$1 [L]
+
+ RewriteRule ^js/(.*)$ frontend/web/js/$1 [L]
+
+ RewriteRule ^images/(.*)$ frontend/web/images/$1 [L]
+
+ RewriteRule ^fonts/(.*)$ frontend/web/fonts/$1 [L]
+
+
+ RewriteCond %{REQUEST_URI} !^/(frontend|backend)/web/(assets|css|js|images|fonts)/
+
+ RewriteCond %{REQUEST_URI} !index.php
+
+ RewriteCond %{REQUEST_FILENAME} !-f [OR]
+
+ RewriteCond %{REQUEST_FILENAME} !-d
+
+ RewriteRule ^.*$ frontend/web/index.php
+
+
+
+#для возможности загрузки файлов парсера
+
+ php_value upload_max_filesize 20M
+ php_value post_max_size 30M
+
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index efa182e..d4bc347 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "0a46956b2ac16c603963c69e1b1f078c",
- "content-hash": "1827ea8c78463126c172696034e7e2aa",
+ "hash": "7f5c25d428fdc1b8171eeefb33740f46",
+ "content-hash": "269319a9b7db2499c82b3ac2409e9b8d",
"packages": [
{
"name": "almasaeed2010/adminlte",
@@ -138,12 +138,12 @@
"version": "2.1.4",
"source": {
"type": "git",
- "url": "https://github.com/jquery/jquery.git",
+ "url": "https://github.com/jquery/jquery-dist.git",
"reference": "7751e69b615c6eca6f783a81e292a55725af6b85"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/jquery/jquery/zipball/7751e69b615c6eca6f783a81e292a55725af6b85",
+ "url": "https://api.github.com/repos/jquery/jquery-dist/zipball/7751e69b615c6eca6f783a81e292a55725af6b85",
"reference": "7751e69b615c6eca6f783a81e292a55725af6b85",
"shasum": ""
},
@@ -204,16 +204,16 @@
},
{
"name": "bower-asset/jquery.inputmask",
- "version": "3.1.63",
+ "version": "3.2.5",
"source": {
"type": "git",
"url": "https://github.com/RobinHerbots/jquery.inputmask.git",
- "reference": "c40c7287eadc31e341ebbf0c02352eb55b9cbc48"
+ "reference": "d08264a678865849c808359d126e3bddb9ec87a6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/RobinHerbots/jquery.inputmask/zipball/c40c7287eadc31e341ebbf0c02352eb55b9cbc48",
- "reference": "c40c7287eadc31e341ebbf0c02352eb55b9cbc48",
+ "url": "https://api.github.com/repos/RobinHerbots/jquery.inputmask/zipball/d08264a678865849c808359d126e3bddb9ec87a6",
+ "reference": "d08264a678865849c808359d126e3bddb9ec87a6",
"shasum": ""
},
"require": {
@@ -222,23 +222,17 @@
"type": "bower-asset-library",
"extra": {
"bower-asset-main": [
- "./dist/inputmask/jquery.inputmask.js",
- "./dist/inputmask/jquery.inputmask.extensions.js",
- "./dist/inputmask/jquery.inputmask.date.extensions.js",
- "./dist/inputmask/jquery.inputmask.numeric.extensions.js",
- "./dist/inputmask/jquery.inputmask.phone.extensions.js",
- "./dist/inputmask/jquery.inputmask.regex.extensions.js"
+ "./dist/inputmask/inputmask.js"
],
"bower-asset-ignore": [
- "**/.*",
- "qunit/",
- "nuget/",
- "tools/",
- "js/",
- "*.md",
- "build.properties",
- "build.xml",
- "jquery.inputmask.jquery.json"
+ "**/*",
+ "!dist/*",
+ "!dist/inputmask/*",
+ "!dist/min/*",
+ "!dist/min/inputmask/*",
+ "!extra/bindings/*",
+ "!extra/dependencyLibs/*",
+ "!extra/phone-codes/*"
]
},
"license": [
@@ -284,16 +278,16 @@
},
{
"name": "bower-asset/yii2-pjax",
- "version": "v2.0.5",
+ "version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/yiisoft/jquery-pjax.git",
- "reference": "6818718408086db6bdcf33649cecb86b6b4f9b67"
+ "reference": "3bceef03fa80ceee8da5854fa3249df1afc871cd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/yiisoft/jquery-pjax/zipball/6818718408086db6bdcf33649cecb86b6b4f9b67",
- "reference": "6818718408086db6bdcf33649cecb86b6b4f9b67",
+ "url": "https://api.github.com/repos/yiisoft/jquery-pjax/zipball/3bceef03fa80ceee8da5854fa3249df1afc871cd",
+ "reference": "3bceef03fa80ceee8da5854fa3249df1afc871cd",
"shasum": ""
},
"require": {
@@ -306,27 +300,32 @@
".travis.yml",
"Gemfile",
"Gemfile.lock",
+ "CONTRIBUTING.md",
"vendor/",
"script/",
"test/"
- ]
+ ],
+ "branch-alias": {
+ "dev-master": "2.0.3-dev"
+ }
},
"license": [
"MIT"
- ]
+ ],
+ "time": "2015-12-31 08:33:51"
},
{
"name": "cebe/markdown",
- "version": "1.1.0",
+ "version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/cebe/markdown.git",
- "reference": "54a2c49de31cc44e864ebf0500a35ef21d0010b2"
+ "reference": "d7b6f46cd423174c8a86c7f816dea45008dbf454"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/cebe/markdown/zipball/54a2c49de31cc44e864ebf0500a35ef21d0010b2",
- "reference": "54a2c49de31cc44e864ebf0500a35ef21d0010b2",
+ "url": "https://api.github.com/repos/cebe/markdown/zipball/d7b6f46cd423174c8a86c7f816dea45008dbf454",
+ "reference": "d7b6f46cd423174c8a86c7f816dea45008dbf454",
"shasum": ""
},
"require": {
@@ -373,7 +372,7 @@
"markdown",
"markdown-extra"
],
- "time": "2015-03-06 05:28:07"
+ "time": "2016-01-21 11:46:58"
},
{
"name": "cebe/yii2-gravatar",
@@ -420,7 +419,7 @@
},
{
"name": "developeruz/yii2-db-rbac",
- "version": "1.0.8",
+ "version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/developeruz/yii2-db-rbac.git",
@@ -559,16 +558,16 @@
},
{
"name": "kartik-v/yii2-krajee-base",
- "version": "v1.7.9",
+ "version": "1.8.2",
"source": {
"type": "git",
"url": "https://github.com/kartik-v/yii2-krajee-base.git",
- "reference": "6f10fd0a0bfccd729764c65fa65eb4ccf2cbade9"
+ "reference": "0c274e31e4392cbafc5fe158eae81738794e02ce"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/kartik-v/yii2-krajee-base/zipball/6f10fd0a0bfccd729764c65fa65eb4ccf2cbade9",
- "reference": "6f10fd0a0bfccd729764c65fa65eb4ccf2cbade9",
+ "url": "https://api.github.com/repos/kartik-v/yii2-krajee-base/zipball/0c274e31e4392cbafc5fe158eae81738794e02ce",
+ "reference": "0c274e31e4392cbafc5fe158eae81738794e02ce",
"shasum": ""
},
"require": {
@@ -601,7 +600,7 @@
"widget",
"yii2"
],
- "time": "2015-11-25 07:03:35"
+ "time": "2016-01-10 12:26:29"
},
{
"name": "kartik-v/yii2-widget-select2",
@@ -609,12 +608,12 @@
"source": {
"type": "git",
"url": "https://github.com/kartik-v/yii2-widget-select2.git",
- "reference": "fa0175d936012eac3f7a382792cbb13948015c4e"
+ "reference": "701bf8069a85fafbac1ced54dcd00e579e60471b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/kartik-v/yii2-widget-select2/zipball/fa0175d936012eac3f7a382792cbb13948015c4e",
- "reference": "fa0175d936012eac3f7a382792cbb13948015c4e",
+ "url": "https://api.github.com/repos/kartik-v/yii2-widget-select2/zipball/701bf8069a85fafbac1ced54dcd00e579e60471b",
+ "reference": "701bf8069a85fafbac1ced54dcd00e579e60471b",
"shasum": ""
},
"require": {
@@ -649,7 +648,7 @@
"widget",
"yii2"
],
- "time": "2015-09-22 03:10:57"
+ "time": "2016-01-10 16:51:42"
},
{
"name": "lusitanian/oauth",
@@ -715,7 +714,7 @@
},
{
"name": "mihaildev/yii2-ckeditor",
- "version": "1.0.1",
+ "version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/MihailDev/yii2-ckeditor.git",
@@ -812,16 +811,16 @@
},
{
"name": "nodge/yii2-eauth",
- "version": "2.3.0",
+ "version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/Nodge/yii2-eauth.git",
- "reference": "25963e78c6083734736187bff992dd9da60fd125"
+ "reference": "f45efd95e3853db33153cc1b856d1f648d221938"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Nodge/yii2-eauth/zipball/25963e78c6083734736187bff992dd9da60fd125",
- "reference": "25963e78c6083734736187bff992dd9da60fd125",
+ "url": "https://api.github.com/repos/Nodge/yii2-eauth/zipball/f45efd95e3853db33153cc1b856d1f648d221938",
+ "reference": "f45efd95e3853db33153cc1b856d1f648d221938",
"shasum": ""
},
"require": {
@@ -861,7 +860,7 @@
"oauth",
"yii2"
],
- "time": "2015-10-17 16:51:17"
+ "time": "2016-01-13 18:15:48"
},
{
"name": "rmrevin/yii2-fontawesome",
@@ -917,16 +916,16 @@
},
{
"name": "swiftmailer/swiftmailer",
- "version": "v5.4.1",
+ "version": "5.x-dev",
"source": {
"type": "git",
"url": "https://github.com/swiftmailer/swiftmailer.git",
- "reference": "0697e6aa65c83edf97bb0f23d8763f94e3f11421"
+ "reference": "fffbc0e2a7e376dbb0a4b5f2ff6847330f20ccf9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/0697e6aa65c83edf97bb0f23d8763f94e3f11421",
- "reference": "0697e6aa65c83edf97bb0f23d8763f94e3f11421",
+ "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/fffbc0e2a7e376dbb0a4b5f2ff6847330f20ccf9",
+ "reference": "fffbc0e2a7e376dbb0a4b5f2ff6847330f20ccf9",
"shasum": ""
},
"require": {
@@ -966,28 +965,29 @@
"mail",
"mailer"
],
- "time": "2015-06-06 14:19:39"
+ "time": "2016-01-03 15:42:47"
},
{
"name": "yiisoft/yii2",
- "version": "2.0.6",
+ "version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/yiisoft/yii2-framework.git",
- "reference": "f42b2eb80f61992438661b01d0d74c6738e2ff38"
+ "reference": "b2e6f32de516b43238db0ed36b1c16bf9f22d2db"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/f42b2eb80f61992438661b01d0d74c6738e2ff38",
- "reference": "f42b2eb80f61992438661b01d0d74c6738e2ff38",
+ "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/b2e6f32de516b43238db0ed36b1c16bf9f22d2db",
+ "reference": "b2e6f32de516b43238db0ed36b1c16bf9f22d2db",
"shasum": ""
},
"require": {
"bower-asset/jquery": "2.1.*@stable | 1.11.*@stable",
- "bower-asset/jquery.inputmask": "3.1.*",
+ "bower-asset/jquery.inputmask": "~3.2.2",
"bower-asset/punycode": "1.3.*",
"bower-asset/yii2-pjax": ">=2.0.1",
"cebe/markdown": "~1.0.0 | ~1.1.0",
+ "ext-ctype": "*",
"ext-mbstring": "*",
"ezyang/htmlpurifier": "4.6.*",
"lib-pcre": "*",
@@ -1046,6 +1046,11 @@
"name": "Paul Klimov",
"email": "klimov.paul@gmail.com",
"role": "Core framework development"
+ },
+ {
+ "name": "Dmitry Naumenko",
+ "email": "d.naumenko.a@gmail.com",
+ "role": "Core framework development"
}
],
"description": "Yii PHP Framework Version 2",
@@ -1054,20 +1059,20 @@
"framework",
"yii2"
],
- "time": "2015-08-05 22:00:30"
+ "time": "2016-01-21 07:55:52"
},
{
"name": "yiisoft/yii2-bootstrap",
- "version": "2.0.5",
+ "version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/yiisoft/yii2-bootstrap.git",
- "reference": "1464f93834b1d5edb1f5625f7ffd6c3723fa4923"
+ "reference": "7de7d5d63d655c0c69764f80f2dfc549e9b1d9f0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/yiisoft/yii2-bootstrap/zipball/1464f93834b1d5edb1f5625f7ffd6c3723fa4923",
- "reference": "1464f93834b1d5edb1f5625f7ffd6c3723fa4923",
+ "url": "https://api.github.com/repos/yiisoft/yii2-bootstrap/zipball/7de7d5d63d655c0c69764f80f2dfc549e9b1d9f0",
+ "reference": "7de7d5d63d655c0c69764f80f2dfc549e9b1d9f0",
"shasum": ""
},
"require": {
@@ -1104,24 +1109,24 @@
"bootstrap",
"yii2"
],
- "time": "2015-09-23 17:48:24"
+ "time": "2015-12-19 19:45:57"
},
{
"name": "yiisoft/yii2-composer",
- "version": "2.0.3",
+ "version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/yiisoft/yii2-composer.git",
- "reference": "ca8d23707ae47d20b0454e4b135c156f6da6d7be"
+ "reference": "574dcb1d101ae55be230e0c00a2428af6ec4c5c1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/yiisoft/yii2-composer/zipball/ca8d23707ae47d20b0454e4b135c156f6da6d7be",
- "reference": "ca8d23707ae47d20b0454e4b135c156f6da6d7be",
+ "url": "https://api.github.com/repos/yiisoft/yii2-composer/zipball/574dcb1d101ae55be230e0c00a2428af6ec4c5c1",
+ "reference": "574dcb1d101ae55be230e0c00a2428af6ec4c5c1",
"shasum": ""
},
"require": {
- "composer-plugin-api": "1.0.0"
+ "composer-plugin-api": "^1.0"
},
"type": "composer-plugin",
"extra": {
@@ -1151,20 +1156,20 @@
"extension installer",
"yii2"
],
- "time": "2015-03-01 06:22:44"
+ "time": "2015-12-01 20:06:03"
},
{
"name": "yiisoft/yii2-jui",
- "version": "2.0.4",
+ "version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/yiisoft/yii2-jui.git",
- "reference": "ce16f29cca654702c2ee500ccad9657a2d2e6a09"
+ "reference": "1425ab29929dd195f468d3c4eb340ab509f28b83"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/yiisoft/yii2-jui/zipball/ce16f29cca654702c2ee500ccad9657a2d2e6a09",
- "reference": "ce16f29cca654702c2ee500ccad9657a2d2e6a09",
+ "url": "https://api.github.com/repos/yiisoft/yii2-jui/zipball/1425ab29929dd195f468d3c4eb340ab509f28b83",
+ "reference": "1425ab29929dd195f468d3c4eb340ab509f28b83",
"shasum": ""
},
"require": {
@@ -1201,20 +1206,20 @@
"jQuery UI",
"yii2"
],
- "time": "2015-05-10 22:09:43"
+ "time": "2015-12-24 06:23:53"
},
{
"name": "yiisoft/yii2-swiftmailer",
- "version": "2.0.4",
+ "version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/yiisoft/yii2-swiftmailer.git",
- "reference": "4ec435a89e30b203cea99770910fb5499cb3627a"
+ "reference": "2cca1bb86444a6438b0720f8c60120a400982366"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/yiisoft/yii2-swiftmailer/zipball/4ec435a89e30b203cea99770910fb5499cb3627a",
- "reference": "4ec435a89e30b203cea99770910fb5499cb3627a",
+ "url": "https://api.github.com/repos/yiisoft/yii2-swiftmailer/zipball/2cca1bb86444a6438b0720f8c60120a400982366",
+ "reference": "2cca1bb86444a6438b0720f8c60120a400982366",
"shasum": ""
},
"require": {
@@ -1251,22 +1256,22 @@
"swiftmailer",
"yii2"
],
- "time": "2015-05-10 22:12:32"
+ "time": "2015-12-07 11:40:31"
}
],
"packages-dev": [
{
"name": "bower-asset/typeahead.js",
- "version": "v0.10.5",
+ "version": "v0.11.1",
"source": {
"type": "git",
"url": "https://github.com/twitter/typeahead.js.git",
- "reference": "5f198b87d1af845da502ea9df93a5e84801ce742"
+ "reference": "588440f66559714280628a4f9799f0c4eb880a4a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twitter/typeahead.js/zipball/5f198b87d1af845da502ea9df93a5e84801ce742",
- "reference": "5f198b87d1af845da502ea9df93a5e84801ce742",
+ "url": "https://api.github.com/repos/twitter/typeahead.js/zipball/588440f66559714280628a4f9799f0c4eb880a4a",
+ "reference": "588440f66559714280628a4f9799f0c4eb880a4a",
"shasum": ""
},
"require": {
@@ -1284,32 +1289,30 @@
},
{
"name": "fzaninotto/faker",
- "version": "v1.5.0",
+ "version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/fzaninotto/Faker.git",
- "reference": "d0190b156bcca848d401fb80f31f504f37141c8d"
+ "reference": "de2ed3bbe68254efeff68db60092fc8ed5298055"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/d0190b156bcca848d401fb80f31f504f37141c8d",
- "reference": "d0190b156bcca848d401fb80f31f504f37141c8d",
+ "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/de2ed3bbe68254efeff68db60092fc8ed5298055",
+ "reference": "de2ed3bbe68254efeff68db60092fc8ed5298055",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
+ "ext-intl": "*",
"phpunit/phpunit": "~4.0",
"squizlabs/php_codesniffer": "~1.5"
},
- "suggest": {
- "ext-intl": "*"
- },
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.5.x-dev"
+ "dev-master": "1.6.x-dev"
}
},
"autoload": {
@@ -1332,11 +1335,11 @@
"faker",
"fixtures"
],
- "time": "2015-05-29 06:29:14"
+ "time": "2016-01-08 14:16:18"
},
{
"name": "phpspec/php-diff",
- "version": "v1.0.2",
+ "version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/phpspec/php-diff.git",
@@ -1370,16 +1373,16 @@
},
{
"name": "yiisoft/yii2-codeception",
- "version": "2.0.4",
+ "version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/yiisoft/yii2-codeception.git",
- "reference": "de5007e7a99359597abbfe1c88dca3ce620061c5"
+ "reference": "ee239c244fd011f11c8827f97ebe7600d03f1841"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/yiisoft/yii2-codeception/zipball/de5007e7a99359597abbfe1c88dca3ce620061c5",
- "reference": "de5007e7a99359597abbfe1c88dca3ce620061c5",
+ "url": "https://api.github.com/repos/yiisoft/yii2-codeception/zipball/ee239c244fd011f11c8827f97ebe7600d03f1841",
+ "reference": "ee239c244fd011f11c8827f97ebe7600d03f1841",
"shasum": ""
},
"require": {
@@ -1411,20 +1414,20 @@
"codeception",
"yii2"
],
- "time": "2015-05-10 22:08:30"
+ "time": "2015-11-20 08:52:21"
},
{
"name": "yiisoft/yii2-debug",
- "version": "2.0.5",
+ "version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/yiisoft/yii2-debug.git",
- "reference": "1b302e67521d46feb2413d9d96ca94ed82b39b0e"
+ "reference": "7a28977497e43bf7180a793389e6a5739ec52756"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/yiisoft/yii2-debug/zipball/1b302e67521d46feb2413d9d96ca94ed82b39b0e",
- "reference": "1b302e67521d46feb2413d9d96ca94ed82b39b0e",
+ "url": "https://api.github.com/repos/yiisoft/yii2-debug/zipball/7a28977497e43bf7180a793389e6a5739ec52756",
+ "reference": "7a28977497e43bf7180a793389e6a5739ec52756",
"shasum": ""
},
"require": {
@@ -1458,24 +1461,24 @@
"debugger",
"yii2"
],
- "time": "2015-08-06 16:14:06"
+ "time": "2015-12-31 16:25:50"
},
{
"name": "yiisoft/yii2-faker",
- "version": "2.0.3",
+ "version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/yiisoft/yii2-faker.git",
- "reference": "b88ca69ee226a3610b2c26c026c3203d7ac50f6c"
+ "reference": "186c77214e0a4b75f10380b4e6e5f82788922cb7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/yiisoft/yii2-faker/zipball/b88ca69ee226a3610b2c26c026c3203d7ac50f6c",
- "reference": "b88ca69ee226a3610b2c26c026c3203d7ac50f6c",
+ "url": "https://api.github.com/repos/yiisoft/yii2-faker/zipball/186c77214e0a4b75f10380b4e6e5f82788922cb7",
+ "reference": "186c77214e0a4b75f10380b4e6e5f82788922cb7",
"shasum": ""
},
"require": {
- "fzaninotto/faker": "*",
+ "fzaninotto/faker": "~1.4",
"yiisoft/yii2": "*"
},
"type": "yii2-extension",
@@ -1505,24 +1508,24 @@
"faker",
"yii2"
],
- "time": "2015-03-01 06:22:44"
+ "time": "2015-12-18 01:52:12"
},
{
"name": "yiisoft/yii2-gii",
- "version": "2.0.4",
+ "version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/yiisoft/yii2-gii.git",
- "reference": "e5a023e8779bd774194842ec1b8fb4917cf04007"
+ "reference": "d1a58d8c64f9075960665dc5347f5906ecb063cf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/yiisoft/yii2-gii/zipball/e5a023e8779bd774194842ec1b8fb4917cf04007",
- "reference": "e5a023e8779bd774194842ec1b8fb4917cf04007",
+ "url": "https://api.github.com/repos/yiisoft/yii2-gii/zipball/d1a58d8c64f9075960665dc5347f5906ecb063cf",
+ "reference": "d1a58d8c64f9075960665dc5347f5906ecb063cf",
"shasum": ""
},
"require": {
- "bower-asset/typeahead.js": "0.10.*",
+ "bower-asset/typeahead.js": "0.10.* | ~0.11.0",
"phpspec/php-diff": ">=1.0.2",
"yiisoft/yii2": ">=2.0.4",
"yiisoft/yii2-bootstrap": "~2.0"
@@ -1558,11 +1561,11 @@
"gii",
"yii2"
],
- "time": "2015-05-10 22:09:31"
+ "time": "2016-01-15 17:12:14"
}
],
"aliases": [],
- "minimum-stability": "stable",
+ "minimum-stability": "dev",
"stability-flags": {
"kartik-v/yii2-widget-select2": 20
},
diff --git a/frontend/assets/AppAsset.php b/frontend/assets/AppAsset.php
index f6ac539..03580a4 100644
--- a/frontend/assets/AppAsset.php
+++ b/frontend/assets/AppAsset.php
@@ -18,15 +18,18 @@ class AppAsset extends AssetBundle
public $basePath = '@webroot';
public $baseUrl = '@web';
public $css = [
- 'css/site.css',
- 'css/flags32.css'
+ 'css/style.css',
];
public $js = [
- 'js/option.js'
+ 'js/script.js',
+ 'http://maps.google.com/maps/api/js?sensor=false',
+ 'js/markerclusterer.js',
+ 'js/jquery.scrollbox.min.js',
+ 'js/slider.js',
+ 'js/jquery.rating.js'
];
public $depends = [
- 'yii\web\YiiAsset',
- 'yii\bootstrap\BootstrapAsset',
+ 'yii\web\YiiAsset'
];
public $jsOptions = array(
'position' => \yii\web\View::POS_HEAD
diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php
index 8f8b8d5..4257359 100644
--- a/frontend/views/layouts/main.php
+++ b/frontend/views/layouts/main.php
@@ -9,94 +9,222 @@ use yii\bootstrap\NavBar;
use yii\widgets\Breadcrumbs;
use frontend\assets\AppAsset;
use common\widgets\Alert;
-use common\models\MenuTree;
+use \yii\widgets\Menu;
+use \yii\helpers\Url;
AppAsset::register($this);
?>
+
beginPage() ?>
+
+
+
+
-
+
= Html::csrfMetaTags() ?>
+
= Html::encode($this->title) ?>
+
head() ?>
+
-
+
+
+
beginBody() ?>
-
- [
- 'class' => 'navbar-inverse navbar-fixed-top',
- ]
- ]);
-
- echo Nav::widget([
- 'options' => ['class' => 'navbar-nav navbar-right'],
- 'items' => (new MenuTree())->build('TOP')
- ]);
-/*
-
- $menuItems = [
- ['label' => 'Home', 'url' => ['/site/index']],
- ['label' => 'About', 'url' => ['/site/about']],
- ['label' => 'Contact', 'url' => ['/site/contact']],
- ];
-
- // меню с базы
- $menuItems = [];
-
- foreach ((new \frontend\models\Front())->actionMenu('TOP') as $row)
- {
- $menuItems[] = ['label' => $row['page_title'], 'url' => $row['page_alias']];
- }
-
- if (Yii::$app->user->isGuest)
- {
- $menuItems[] = ['label' => 'Signup', 'url' => ['/site/signup']];
- $menuItems[] = ['label' => 'Login', 'url' => ['/site/login']];
- }
- else
- {
- $menuItems[] = [
- 'label' => 'Logout (' . Yii::$app->user->identity->username . ')',
- 'url' => ['/site/logout'],
- 'linkOptions' => ['data-method' => 'post']
- ];
- }
-
- echo Nav::widget([
- 'options' => ['class' => 'navbar-nav navbar-right'],
- 'items' => $menuItems,
- ]);
-*/
- NavBar::end();
-
- ?>
-
-
-
- = Breadcrumbs::widget([
- 'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
- ]) ?>
- = Alert::widget() ?>
- = $content ?>
+
+
+
-