add Vitaliy's widgets

Administrator
1 parent 8f939a27
Showing 36 changed files with 33 additions and 41 deletions Show diff stats
.bowerrc
common/models/CompanyInfo.php
common/models/CompanyInfoSearch.php
common/models/Job.php
common/models/JobSearch.php
composer.lock
console/migrations/m160202_090343_user_add_fields.php
console/migrations/m160202_094943_user_info_country_city.php
console/migrations/m160203_133308_add_field_specialization.php
console/migrations/m160203_140144_add_field_user_info.php
frontend/assets/AppAsset.php
frontend/controllers/CompanyInfoController.php
frontend/controllers/JobController.php
frontend/views/accounts/_job_form.php
frontend/views/accounts/add-skills.php
frontend/views/accounts/contacts.php
frontend/views/accounts/employment.php
frontend/views/accounts/gallery.php
frontend/views/accounts/general.php
frontend/views/accounts/portfolio.php
@@ -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": [],
@@ -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',
@@ -20,7 +20,7 @@
     <?php
         $form = ActiveForm::begin ();
         echo $form->field ($user, 'isPerformer', ['template' => "{label}:\n{input}\n{hint}\n{error}"])
-                  ->label ('Я - исполнитель')
+                  ->label ('<span1></span>Я - исполнитель')
                   ->hint ('Отображается если указать специализации услуг в личном кабинете.')
                   ->checkbox ([], false);
         echo $form->field ($user, 'isCustomer', ['template' => "{label}:\n{input}\n{hint}\n{error}"])
@@ -9,18 +9,6 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
 ?>
     <div class="wrap">
         <div class="container">
-            <div class="left_block">
-                <?php
-                echo Menu::widget([
-                    'options' => ['class' => 'nav nav-pills nav-stacked'],
-                    'items' => [
-                        ['label' => 'Кабинет', 'url' => ['accounts/cabinet']],
-
-                        ['label' => 'Выход', 'url' => ['/site/logout']],
-                    ],
-                ]);
-                ?>
-            </div>
             <div class="right_block">
                 <?= Breadcrumbs::widget([
                     'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
@@ -71,6 +59,10 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
                                             'label' => 'Галерея',
                                             'url' => ['accounts/gallery'],
                                         ],
+                                        [
+                                            'label' => 'Выход',
+                                            'url' => ['/site/logout']
+                                        ],
                                     ],
                                 ]);
                             ?>
@@ -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');
 ?>