diff --git a/.bowerrc b/.bowerrc old mode 100644 new mode 100755 index 1669168..1669168 --- a/.bowerrc +++ b/.bowerrc diff --git a/common/models/CompanyInfo.php b/common/models/CompanyInfo.php old mode 100644 new mode 100755 index e8f0b7b..e8f0b7b --- a/common/models/CompanyInfo.php +++ b/common/models/CompanyInfo.php diff --git a/common/models/CompanyInfoSearch.php b/common/models/CompanyInfoSearch.php old mode 100644 new mode 100755 index 4213d75..4213d75 --- a/common/models/CompanyInfoSearch.php +++ b/common/models/CompanyInfoSearch.php diff --git a/common/models/Job.php b/common/models/Job.php old mode 100644 new mode 100755 index 8fbff20..8fbff20 --- a/common/models/Job.php +++ b/common/models/Job.php diff --git a/common/models/JobSearch.php b/common/models/JobSearch.php old mode 100644 new mode 100755 index 4e0c062..4e0c062 --- a/common/models/JobSearch.php +++ b/common/models/JobSearch.php diff --git a/composer.lock b/composer.lock index 7ec940f..52f9361 100755 --- a/composer.lock +++ b/composer.lock @@ -204,16 +204,16 @@ }, { "name": "bower-asset/jquery.inputmask", - "version": "3.2.5", + "version": "3.2.7", "source": { "type": "git", "url": "https://github.com/RobinHerbots/jquery.inputmask.git", - "reference": "d08264a678865849c808359d126e3bddb9ec87a6" + "reference": "5a72c563b502b8e05958a524cdfffafe9987be38" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/RobinHerbots/jquery.inputmask/zipball/d08264a678865849c808359d126e3bddb9ec87a6", - "reference": "d08264a678865849c808359d126e3bddb9ec87a6", + "url": "https://api.github.com/repos/RobinHerbots/jquery.inputmask/zipball/5a72c563b502b8e05958a524cdfffafe9987be38", + "reference": "5a72c563b502b8e05958a524cdfffafe9987be38", "shasum": "" }, "require": { @@ -615,16 +615,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": { @@ -657,7 +657,7 @@ "widget", "yii2" ], - "time": "2015-11-25 07:03:35" + "time": "2016-01-10 12:26:29" }, { "name": "kartik-v/yii2-widget-select2", @@ -665,12 +665,12 @@ "source": { "type": "git", "url": "https://github.com/kartik-v/yii2-widget-select2.git", - "reference": "701bf8069a85fafbac1ced54dcd00e579e60471b" + "reference": "519241c7360a0470624f24d872741e1ea880de75" }, "dist": { "type": "zip", "url": "https://api.github.com/repos/kartik-v/yii2-widget-select2/zipball/519241c7360a0470624f24d872741e1ea880de75", - "reference": "701bf8069a85fafbac1ced54dcd00e579e60471b", + "reference": "519241c7360a0470624f24d872741e1ea880de75", "shasum": "" }, "require": { @@ -705,7 +705,7 @@ "widget", "yii2" ], - "time": "2016-01-10 16:51:42" + "time": "2016-02-01 02:19:01" }, { "name": "lusitanian/oauth", @@ -1080,12 +1080,12 @@ "source": { "type": "git", "url": "https://github.com/yiisoft/yii2-framework.git", - "reference": "e4359f68b70caede1e09ecefb56e9435f7d140af" + "reference": "7ccbfdf4cfb0ce025e27455dc3e516af23eb2800" }, "dist": { "type": "zip", "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/7ccbfdf4cfb0ce025e27455dc3e516af23eb2800", - "reference": "e4359f68b70caede1e09ecefb56e9435f7d140af", + "reference": "7ccbfdf4cfb0ce025e27455dc3e516af23eb2800", "shasum": "" }, "require": { @@ -1166,7 +1166,7 @@ "framework", "yii2" ], - "time": "2016-01-23 08:43:29" + "time": "2016-01-28 20:15:10" }, { "name": "yiisoft/yii2-bootstrap", @@ -1319,12 +1319,12 @@ "source": { "type": "git", "url": "https://github.com/yiisoft/yii2-jui.git", - "reference": "7ab7ff56bd54500212523e38f5fe3b9210325041" + "reference": "1425ab29929dd195f468d3c4eb340ab509f28b83" }, "dist": { "type": "zip", "url": "https://api.github.com/repos/yiisoft/yii2-jui/zipball/1425ab29929dd195f468d3c4eb340ab509f28b83", - "reference": "7ab7ff56bd54500212523e38f5fe3b9210325041", + "reference": "1425ab29929dd195f468d3c4eb340ab509f28b83", "shasum": "" }, "require": { @@ -1361,7 +1361,7 @@ "jQuery UI", "yii2" ], - "time": "2015-12-07 11:33:55" + "time": "2015-12-24 06:23:53" }, { "name": "yiisoft/yii2-swiftmailer", @@ -1448,12 +1448,12 @@ "source": { "type": "git", "url": "https://github.com/fzaninotto/Faker.git", - "reference": "de2ed3bbe68254efeff68db60092fc8ed5298055" + "reference": "b312ab9d0c446971069e22a524fec01c7cddc75e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/e493d3dc48d15a6d44e213d02c729ad61cc758a9", - "reference": "de2ed3bbe68254efeff68db60092fc8ed5298055", + "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/b312ab9d0c446971069e22a524fec01c7cddc75e", + "reference": "b312ab9d0c446971069e22a524fec01c7cddc75e", "shasum": "" }, "require": { @@ -1490,7 +1490,7 @@ "faker", "fixtures" ], - "time": "2016-01-08 14:16:18" + "time": "2016-02-01 17:08:46" }, { "name": "phpspec/php-diff", @@ -1671,12 +1671,12 @@ "source": { "type": "git", "url": "https://github.com/yiisoft/yii2-gii.git", - "reference": "d1a58d8c64f9075960665dc5347f5906ecb063cf" + "reference": "bb0eba84639a99bff6c8bc9e803bd8ac3ab66297" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-gii/zipball/d1a58d8c64f9075960665dc5347f5906ecb063cf", - "reference": "d1a58d8c64f9075960665dc5347f5906ecb063cf", + "url": "https://api.github.com/repos/yiisoft/yii2-gii/zipball/bb0eba84639a99bff6c8bc9e803bd8ac3ab66297", + "reference": "bb0eba84639a99bff6c8bc9e803bd8ac3ab66297", "shasum": "" }, "require": { @@ -1716,7 +1716,7 @@ "gii", "yii2" ], - "time": "2016-01-15 17:12:14" + "time": "2016-02-02 07:11:51" } ], "aliases": [], diff --git a/console/migrations/m160202_090343_user_add_fields.php b/console/migrations/m160202_090343_user_add_fields.php old mode 100644 new mode 100755 index 6a37820..6a37820 --- a/console/migrations/m160202_090343_user_add_fields.php +++ b/console/migrations/m160202_090343_user_add_fields.php diff --git a/console/migrations/m160202_094943_user_info_country_city.php b/console/migrations/m160202_094943_user_info_country_city.php old mode 100644 new mode 100755 index 5603f81..5603f81 --- a/console/migrations/m160202_094943_user_info_country_city.php +++ b/console/migrations/m160202_094943_user_info_country_city.php diff --git a/console/migrations/m160203_133308_add_field_specialization.php b/console/migrations/m160203_133308_add_field_specialization.php old mode 100644 new mode 100755 index 192186c..192186c --- a/console/migrations/m160203_133308_add_field_specialization.php +++ b/console/migrations/m160203_133308_add_field_specialization.php diff --git a/console/migrations/m160203_140144_add_field_user_info.php b/console/migrations/m160203_140144_add_field_user_info.php old mode 100644 new mode 100755 index eea447e..eea447e --- a/console/migrations/m160203_140144_add_field_user_info.php +++ b/console/migrations/m160203_140144_add_field_user_info.php diff --git a/frontend/assets/AppAsset.php b/frontend/assets/AppAsset.php index 38dade6..6d88d39 100755 --- a/frontend/assets/AppAsset.php +++ b/frontend/assets/AppAsset.php @@ -20,7 +20,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/controllers/CompanyInfoController.php b/frontend/controllers/CompanyInfoController.php old mode 100644 new mode 100755 index 3bf053a..3bf053a --- a/frontend/controllers/CompanyInfoController.php +++ b/frontend/controllers/CompanyInfoController.php diff --git a/frontend/controllers/JobController.php b/frontend/controllers/JobController.php old mode 100644 new mode 100755 index 1c88a22..1c88a22 --- a/frontend/controllers/JobController.php +++ b/frontend/controllers/JobController.php diff --git a/frontend/views/accounts/_job_form.php b/frontend/views/accounts/_job_form.php old mode 100644 new mode 100755 index 7e26125..7e26125 --- a/frontend/views/accounts/_job_form.php +++ b/frontend/views/accounts/_job_form.php diff --git a/frontend/views/accounts/add-skills.php b/frontend/views/accounts/add-skills.php old mode 100644 new mode 100755 index 162a954..162a954 --- a/frontend/views/accounts/add-skills.php +++ b/frontend/views/accounts/add-skills.php diff --git a/frontend/views/accounts/contacts.php b/frontend/views/accounts/contacts.php old mode 100644 new mode 100755 index 162a954..162a954 --- a/frontend/views/accounts/contacts.php +++ b/frontend/views/accounts/contacts.php diff --git a/frontend/views/accounts/employment.php b/frontend/views/accounts/employment.php old mode 100644 new mode 100755 index eae5d97..eae5d97 --- a/frontend/views/accounts/employment.php +++ b/frontend/views/accounts/employment.php diff --git a/frontend/views/accounts/gallery.php b/frontend/views/accounts/gallery.php old mode 100644 new mode 100755 index 162a954..162a954 --- a/frontend/views/accounts/gallery.php +++ b/frontend/views/accounts/gallery.php diff --git a/frontend/views/accounts/general.php b/frontend/views/accounts/general.php old mode 100644 new mode 100755 index 2dc12b6..866dd7b --- a/frontend/views/accounts/general.php +++ b/frontend/views/accounts/general.php @@ -20,7 +20,7 @@ field ($user, 'isPerformer', ['template' => "{label}:\n{input}\n{hint}\n{error}"]) - ->label ('Я - исполнитель') + ->label ('Я - исполнитель') ->hint ('Отображается если указать специализации услуг в личном кабинете.') ->checkbox ([], false); echo $form->field ($user, 'isCustomer', ['template' => "{label}:\n{input}\n{hint}\n{error}"]) diff --git a/frontend/views/accounts/portfolio.php b/frontend/views/accounts/portfolio.php old mode 100644 new mode 100755 index 162a954..162a954 --- a/frontend/views/accounts/portfolio.php +++ b/frontend/views/accounts/portfolio.php diff --git a/frontend/views/accounts/service.php b/frontend/views/accounts/service.php old mode 100644 new mode 100755 index 4ec4085..4ec4085 --- a/frontend/views/accounts/service.php +++ b/frontend/views/accounts/service.php diff --git a/frontend/views/accounts/setting.php b/frontend/views/accounts/setting.php old mode 100644 new mode 100755 index bc0675f..bc0675f --- a/frontend/views/accounts/setting.php +++ b/frontend/views/accounts/setting.php diff --git a/frontend/views/company-info/_form.php b/frontend/views/company-info/_form.php old mode 100644 new mode 100755 index 85cb943..85cb943 --- a/frontend/views/company-info/_form.php +++ b/frontend/views/company-info/_form.php diff --git a/frontend/views/company-info/_search.php b/frontend/views/company-info/_search.php old mode 100644 new mode 100755 index 4db4f06..4db4f06 --- a/frontend/views/company-info/_search.php +++ b/frontend/views/company-info/_search.php diff --git a/frontend/views/company-info/create.php b/frontend/views/company-info/create.php old mode 100644 new mode 100755 index f5c0c4b..f5c0c4b --- a/frontend/views/company-info/create.php +++ b/frontend/views/company-info/create.php diff --git a/frontend/views/company-info/index.php b/frontend/views/company-info/index.php old mode 100644 new mode 100755 index 4417223..4417223 --- a/frontend/views/company-info/index.php +++ b/frontend/views/company-info/index.php diff --git a/frontend/views/company-info/update.php b/frontend/views/company-info/update.php old mode 100644 new mode 100755 index 39c7a64..39c7a64 --- a/frontend/views/company-info/update.php +++ b/frontend/views/company-info/update.php diff --git a/frontend/views/company-info/view.php b/frontend/views/company-info/view.php old mode 100644 new mode 100755 index 3375a85..3375a85 --- a/frontend/views/company-info/view.php +++ b/frontend/views/company-info/view.php diff --git a/frontend/views/job/_form.php b/frontend/views/job/_form.php old mode 100644 new mode 100755 index 98c9008..98c9008 --- a/frontend/views/job/_form.php +++ b/frontend/views/job/_form.php diff --git a/frontend/views/job/_search.php b/frontend/views/job/_search.php old mode 100644 new mode 100755 index 0e4d755..0e4d755 --- a/frontend/views/job/_search.php +++ b/frontend/views/job/_search.php diff --git a/frontend/views/job/create.php b/frontend/views/job/create.php old mode 100644 new mode 100755 index 603190b..603190b --- a/frontend/views/job/create.php +++ b/frontend/views/job/create.php diff --git a/frontend/views/job/index.php b/frontend/views/job/index.php old mode 100644 new mode 100755 index f12029e..f12029e --- a/frontend/views/job/index.php +++ b/frontend/views/job/index.php diff --git a/frontend/views/job/update.php b/frontend/views/job/update.php old mode 100644 new mode 100755 index 3fe0ac8..3fe0ac8 --- a/frontend/views/job/update.php +++ b/frontend/views/job/update.php diff --git a/frontend/views/job/view.php b/frontend/views/job/view.php old mode 100644 new mode 100755 index 62e390b..62e390b --- a/frontend/views/job/view.php +++ b/frontend/views/job/view.php diff --git a/frontend/views/layouts/admin.php b/frontend/views/layouts/admin.php index 1516565..cd1cfd5 100755 --- a/frontend/views/layouts/admin.php +++ b/frontend/views/layouts/admin.php @@ -9,18 +9,6 @@ $this->beginContent('@app/views/layouts/main.php'); ?>
-
- ['class' => 'nav nav-pills nav-stacked'], - 'items' => [ - ['label' => 'Кабинет', 'url' => ['accounts/cabinet']], - - ['label' => 'Выход', 'url' => ['/site/logout']], - ], - ]); - ?> -
isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [], @@ -71,6 +59,10 @@ $this->beginContent('@app/views/layouts/main.php'); 'label' => 'Галерея', 'url' => ['accounts/gallery'], ], + [ + 'label' => 'Выход', + 'url' => ['/site/logout'] + ], ], ]); ?> diff --git a/frontend/views/layouts/performer.php b/frontend/views/layouts/performer.php index 82d0b2e..91a21ff 100755 --- a/frontend/views/layouts/performer.php +++ b/frontend/views/layouts/performer.php @@ -3,7 +3,7 @@ use yii\widgets\Breadcrumbs; use yii\widgets\Menu; -\frontend\assets\AdminAsset::register($this); +\frontend\assets\AppAsset::register($this); /* @var $content string */ $this->beginContent('@app/views/layouts/main.php'); ?> -- libgit2 0.21.4