From 3ddcc442d7facc74b9452094a627c2fb1c0770d1 Mon Sep 17 00:00:00 2001
From: Yarik <kingofdusk@gmail.com>
Date: Thu, 7 Apr 2016 17:57:49 +0300
Subject: [PATCH] test

---
 frontend/assets/AdminAsset.php              |  2 +-
 frontend/assets/AppAsset.php                |  2 +-
 frontend/views/accounts/_portfolio_form.php | 70 ++++++----------------------------------------------------------------
 frontend/views/ajax/users.php               |  3 +++
 frontend/web/js/script.js                   | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 71 insertions(+), 66 deletions(-)

diff --git a/frontend/assets/AdminAsset.php b/frontend/assets/AdminAsset.php
index 629577a..de7c658 100755
--- a/frontend/assets/AdminAsset.php
+++ b/frontend/assets/AdminAsset.php
@@ -21,7 +21,7 @@ class AdminAsset extends AssetBundle
         'css/style.css',
         'css/art_box.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/assets/AppAsset.php b/frontend/assets/AppAsset.php
index c28d4f1..cc1298c 100755
--- a/frontend/assets/AppAsset.php
+++ b/frontend/assets/AppAsset.php
@@ -19,7 +19,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',
         '/css/owl.carousel.css'
     ];
     public $js = [
diff --git a/frontend/views/accounts/_portfolio_form.php b/frontend/views/accounts/_portfolio_form.php
index 979c107..fe706b9 100644
--- a/frontend/views/accounts/_portfolio_form.php
+++ b/frontend/views/accounts/_portfolio_form.php
@@ -184,6 +184,9 @@
 
     <div class="clearfix"></div>
 
+    <?php
+    /* == Project add user block == */
+    ?>
     <div class="add_project_user_wrapper" id="<?= $form->id ?>_project_user">
         <p>Добавить пользователя</p>
         <p><?= Html::a('Добавить', false, [ 'class' => 'add_project_user_link' ]) ?></p>
@@ -195,70 +198,9 @@
             ?>
         </div>
     </div>
-    <script>
-        $(
-            function()
-            {
-                $(document).on(
-                    'click', '.add_project_user_link', function()
-                    {
-                        var component = $(this).parents('.add_project_user_wrapper').attr('id');
-                        var ids = [];
-                        $.each(
-                            $('#' + component).find('.project_user_wrapper'), function(i, val)
-                            {
-                                if(ids.indexOf($(val).data('id')) < 0)
-                                {
-                                    ids.push($(val).data('id'));
-                                }
-                            }
-                        );
-                        $.fancybox.open(
-                            {href : '/ajax/project-user'}, {
-                                type : 'ajax', maxWidth : 750,
-                                ajax : {dataType : 'html', data : {ids : JSON.stringify(ids)}},
-                                tpl : {wrap : '<div class="fancybox-wrap" tabIndex="-1" data-model="common\\models\\PortfolioUser" data-component="' + component + '"><div class="fancybox-skin"><div class="fancybox-outer"><div class="fancybox-inner"></div></div></div></div>'}
-                            }
-                        );
-                    }
-                );
-                $(document).on(
-                    'click', '.user_search_modal_tick', function()
-                    {
-                        var user_id = $(this).parents('.user_search_modal_row').data('key');
-                        var model = $(this).parents('.fancybox-wrap').data('model');
-                        var component = $(this).parents('.fancybox-wrap').data('component');
-                        var result;
-                        $.fancybox.close();
-                        $.fancybox.showLoading();
-                        $.get(
-                            '/ajax/user-input', {
-                                id : user_id, model : model, component : component
-                            }, function(data)
-                            {
-                                if(data.result.component !== undefined)
-                                {
-                                    $('#' + data.result.component).find('.add_project_user_list')
-                                                                  .append(data.result.html);
-                                }
-                            }
-                        ).always(
-                            function()
-                            {
-                                $.fancybox.hideLoading();
-                            }
-                        );
-                    }
-                );
-                $(document).on(
-                    'click', '.project_user_remove', function()
-                    {
-                        $(this).parents('.project_user_wrapper').remove();
-                    }
-                );
-            }
-        );
-    </script>
+    <?php
+    /* == End of project add user block == */
+    ?>
 
 </div>
 
diff --git a/frontend/views/ajax/users.php b/frontend/views/ajax/users.php
index c178cf9..491e429 100644
--- a/frontend/views/ajax/users.php
+++ b/frontend/views/ajax/users.php
@@ -58,6 +58,9 @@
             ],
             [
                 'attribute' => 'firstname',
+                'content' => function($model, $key, $index, $column) {
+                    return Html::a($model->firstname, ['performer/common', 'performer_id' => $model->id], ['target' => '_blank', 'data-pjax' => 0]);
+                },
                 'filter' => Html::activeInput('text', $model, 'name_search'),
             ],
             [
diff --git a/frontend/web/js/script.js b/frontend/web/js/script.js
index b067cfc..ed0229f 100755
--- a/frontend/web/js/script.js
+++ b/frontend/web/js/script.js
@@ -1143,5 +1143,65 @@ $(document).ready(
             }
         )
 
+        $(document).on(
+            'click', '.add_project_user_link', function()
+            {
+                var component = $(this).parents('.add_project_user_wrapper').attr('id');
+                var ids = [];
+                $.each(
+                    $('#' + component).find('.project_user_wrapper'), function(i, val)
+                    {
+                        if(ids.indexOf($(val).data('id')) < 0)
+                        {
+                            ids.push($(val).data('id'));
+                        }
+                    }
+                );
+                $.fancybox.open(
+                    {href : '/ajax/project-user'}, {
+                        type : 'ajax',
+                        margin: [50, 20, 30, 20],
+                        maxWidth : 800,
+                        ajax : {dataType : 'html', data : {ids : JSON.stringify(ids)}},
+                        tpl : {wrap : '<div class="fancybox-wrap" tabIndex="-1" data-model="common\\models\\PortfolioUser" data-component="' + component + '"><div class="fancybox-skin"><div class="fancybox-outer"><div class="fancybox-inner"></div></div></div></div>'}
+                    }
+                );
+            }
+        );
+        $(document).on(
+            'click', '.user_search_modal_tick', function()
+            {
+                var user_id = $(this).parents('.user_search_modal_row').data('key');
+                var model = $(this).parents('.fancybox-wrap').data('model');
+                var component = $(this).parents('.fancybox-wrap').data('component');
+                var result;
+                $.fancybox.close();
+                $.fancybox.showLoading();
+                $.get(
+                    '/ajax/user-input', {
+                        id : user_id, model : model, component : component
+                    }, function(data)
+                    {
+                        if(data.result.component !== undefined)
+                        {
+                            $('#' + data.result.component).find('.add_project_user_list')
+                                                          .append(data.result.html);
+                        }
+                    }
+                ).always(
+                    function()
+                    {
+                        $.fancybox.hideLoading();
+                    }
+                );
+            }
+        );
+        $(document).on(
+            'click', '.project_user_remove', function()
+            {
+                $(this).parents('.project_user_wrapper').remove();
+            }
+        );
+
     }
 );
\ No newline at end of file
--
libgit2 0.21.4