Merge remote-tracking branch 'origin/master'

Виталий
2 parents 19aeb07c 3d0e6093
Showing 9 changed files with 107 additions and 28 deletions Show diff stats
common/behaviors/ShowImage.php
common/models/Fields.php
frontend/assets/FancyboxAsset.php
frontend/controllers/AccountsController.php
frontend/controllers/PerformerController.php
frontend/views/accounts/_gallery_form.php
frontend/views/accounts/gallery.php
frontend/views/performer/_gallery_list_view.php
frontend/views/performer/gallery.php
@@ -8,6 +8,10 @@ use yii\base\Behavior;
 class ShowImage extends Behavior
 {
     function minImg($dir, $width, $height=null){
+        if(empty($dir)){
+            return $dir;
+        }
+
         if($width=='original'){
             $preg = '/\/(.[^\/]*)$/';
             preg_match('/\.(.[^.]*)$/', $dir, $type);
@@ -23,4 +27,5 @@ class ShowImage extends Behavior
     }
+
 }
 \ No newline at end of file
@@ -104,4 +104,52 @@ class Fields extends \yii\db\ActiveRecord
             }
         }
     }
+
+
+    /**
+     * @param $post - array with field data
+     * @param $table_id - row id in model table
+     * @param $table_name - madel table name
+     * @param $language - language id
+     */
+
+    public static function saveFieldVideoData($post,$table_id,$table_name, $language){
+
+        self::deleteAll(['table_id'=>$table_id, 'table_name'=>$table_name, 'language' => $language, 'field_type' => array_keys($post)]);
+
+        if($post){
+
+
+            foreach($post as $k => $field){
+
+
+
+                foreach($field as $parent_key => $row){
+
+                    foreach($row as $key => $value){
+
+                        preg_match('/src=\"(.[^"]*)\"/', $value[array_keys($value)[0]], $video_url);
+
+                        if(isset($video_url[1]) && !empty($video_url[1])){
+
+                            $field_model = new Fields();
+                            $field_model->field_name =  array_keys($value)[0];
+                            $field_model->value = $video_url[1].'?showinfo=0&autoplay=0';
+                            $field_model->table_name =  $table_name;
+                            $field_model->table_id   = $table_id;
+                            $field_model->field_type =  $k;
+                            $field_model->language =  'ru';
+                            $field_model->parent_key =  $parent_key;
+                            $field_model->key =  $key;
+                            $field_model->save();
+
+                        }
+
+
+                    }
+
+                }
+            }
+        }
+    }
 }
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+
+namespace frontend\assets;
+
+use yii\web\AssetBundle;
+
+/**
+ * Asset bundle for the Twitter bootstrap javascript files.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class FancyboxAsset extends AssetBundle
+{
+    public $sourcePath = '@bower/fancybox/';
+
+    public $css = [
+        'source/jquery.fancybox.css',
+        'source/helpers/jquery.fancybox-buttons.css',
+        'source/helpers/jquery.fancybox-thumbs.css'
+
+    ];
+
+    public $js = [
+        'lib/jquery.mousewheel-3.0.6.pack.js',
+        'source/jquery.fancybox.pack.js',
+        'source/helpers/jquery.fancybox-buttons.js',
+        'source/helpers/jquery.fancybox-media.js',
+        'source/helpers/jquery.fancybox-thumbs.js'
+
+
+    ];
+}
@@ -63,7 +63,6 @@
                         'portfolio-delete' => [ 'POST' ],
                         'projects-delete'  => [ 'POST' ],
                         'blog-delete'      => [ 'POST' ],
-                        'gallery'          => [ 'POST' ],
                     ],
                 ],
             ];
@@ -259,7 +258,7 @@
             if(!empty(Yii::$app->request->post('Fields'))) {
-                Fields::saveFieldData(Yii::$app->request->post('Fields'), $user->id, Gallery::className(), 'ru');
+                Fields::saveFieldVideoData(Yii::$app->request->post('Fields'), $user->id, Gallery::className(), 'ru');
             }
             return $this->render('gallery-video', [
@@ -193,12 +193,15 @@ class PerformerController extends Controller
             'allModels' => $gallery,
         ]);
+        $videos = Fields::getData($user->id,Gallery::className(),'youtube');
+
         $this->layout = 'gallery';
         return $this->render('gallery',[
             'user' => $user,
             'gallery' =>$gallery,
-            'pagination' => $pagination
+            'pagination' => $pagination,
+            'videos' => $videos
          ]);
     }
 }
@@ -36,8 +36,8 @@
 <?= ImageUploader::widget([
     'model'   => $gallery,
     'field'   => 'photo',
-    'width'   => 148,
-    'height'  => 104,
+    'width'   => 152,
+    'height'  => 108,
     'multi'   => true,
     'gallery' => $gallery->photo,
     'name'    => 'Загрузить фото галереи',
@@ -16,6 +16,7 @@
     <?= Html::a(Yii::t('app', 'Добавить'), [ 'gallery-create' ], [ 'class' => 'btn btn-success' ]) ?>
 </p>
 <?= GridView::widget([
+    'options'=>['class'=>'test'],
     'dataProvider' => $dataProvider,
     'filterModel'  => $searchModel,
     'columns'      => [
@@ -11,7 +11,7 @@
         </div>
         <div class="gallery-box-big">
-            <?php foreach(explode(',', $model->photo ) as $image):?>
+            <?php foreach(explode(',', $model->photo ) as $image): ?>
                 <span data-link="<?= $model->minImg($image, 'original'); ?>"></span>
             <?php endforeach; ?>
         </div>
@@ -13,29 +13,14 @@ $this-&gt;title = &#39;My Yii Application&#39;;
     <div class="slider-video-wr">
         <div id="demo5" class="scroll-img video-slider">
             <ul>
-                <li>
-                    <div class="iframe-video"><iframe width="560" height="320" src="https://www.youtube.com/embed/0wAgwxcO1HY?showinfo=0&autoplay=0" frameborder="0" allowfullscreen></iframe></div>
+                <?php foreach($videos as $video):?>
+                    <li>
+                        <div class="iframe-video"><iframe width="560" height="320" src="<?= $video['youtube'] ?>" frameborder="0" allowfullscreen></iframe></div>
-                    <a href="#"></a><span></span>
-                </li>
-                <li>
-                    <div class="iframe-video"><iframe width="100%" height="100%" src="https://www.youtube.com/embed/0wAgwxcO1HY" frameborder="0" allowfullscreen></iframe></div>
-                    <a href="#"></a><span></span>
-                </li>
+                        <a href="#"></a><span></span>
+                    </li>
+                <?php endforeach; ?>
-                <li>
-                    <div class="iframe-video"><iframe width="560" height="320" src="https://www.youtube.com/embed/0wAgwxcO1HY?showinfo=0&autoplay=0" frameborder="0" allowfullscreen></iframe></div>
-                    <a href="#"></a><span></span>
-                </li>
-                <li>
-                    <div class="iframe-video"><iframe width="100%" height="100%" src="https://www.youtube.com/embed/0wAgwxcO1HY" frameborder="0" allowfullscreen></iframe></div>
-                    <a href="#"></a><span></span>
-                </li>
-
-                <li>
-                    <div class="iframe-video"><iframe width="560" height="320" src="https://www.youtube.com/embed/0wAgwxcO1HY?showinfo=0&autoplay=0" frameborder="0" allowfullscreen></iframe></div>
-                    <a href="#"></a><span></span>
-                </li>
             </ul>
         </div>
         <div id="demo5-btn" class="text-center">
@@ -47,7 +32,6 @@ $this-&gt;title = &#39;My Yii Application&#39;;
 </div>
 <div class="gallery-performer-wrapper style">
-    <div class="gallery-title">Фото: 130</div>
     <div class="gallery-performer-margin">
         <?=
         ListView::widget( [