Commit

Yarik
1 parent 282b6e56
Showing 9 changed files with 118 additions and 40 deletions Show diff stats
common/behaviors/ShowImage.php
common/models/Portfolio.php
frontend/views/company/portfolio-view.php
frontend/views/performer/blog-view.php
frontend/views/performer/portfolio-view.php
frontend/web/css/style.css
frontend/web/images/ico-google.png
frontend/web/images/watermark.png
storage/.htaccess
 <?php
-
+    
     namespace common\behaviors;
-
+    
     use common\modules\file\components\UploaderComponent;
     use yii;
     use yii\base\Behavior;
-
+    use yii\imagine\Image;
+    
     class ShowImage extends Behavior
     {
-
+        
         /**
          * Resize image and return its path.
          *
@@ -24,14 +25,14 @@
             if(empty( $dir )) {
                 return '/images/imageNotFound.jpg';
             }
-
+            
             if($width == 'original') {
                 $preg = '/\/(.[^\/]*)$/';
                 preg_match('/\.(.[^.]*)$/', $dir, $type);
                 if(isset( $type[ 1 ] )) {
                     $dir = preg_replace($preg, '/original.' . $type[ 1 ], $dir);
                 }
-
+                
             } else {
                 $preg = '/\/(.[^\/]*)$/';
                 preg_match('/\.(.[^.]*)$/', $dir, $type);
@@ -40,32 +41,27 @@
                     $storage = dirname(yii\helpers\Url::to('@storage'));
                     $filename = $storage . $dir;
                     if(!file_exists($filename)) {
-
+                        
                         $original = $storage . dirname($dir) . '/original.' . $type[ 1 ];
                         $resizer = new UploaderComponent();
                         if(file_exists($original)) {
                             $resizer->resizeImg($width, $height, $original, $filename);
                         } else {
-
-                            $imageNotFound = yii\helpers\Url::to('@storage')."/imageNotFound".$width."x".$height.".jpg";
-                            if(!file_exists($imageNotFound)){
-                                 $resizer->resizeImg($width, $height, yii\helpers\Url::to('@storage')."/imageNotFound.jpg", $imageNotFound );
+                            $imageNotFound = yii\helpers\Url::to('@storage') . "/imageNotFound" . $width . "x" . $height . ".jpg";
+                            if(!file_exists($imageNotFound)) {
+                                $resizer->resizeImg($width, $height, yii\helpers\Url::to('@storage') . "/imageNotFound.jpg", $imageNotFound);
                             }
-                            return "/storage/imageNotFound".$width."x".$height.".jpg";
-
-
+                            return "/storage/imageNotFound" . $width . "x" . $height . ".jpg";
                         }
-
+                        
                     }
-
+                    
                 }
-
+                
             }
-
             return $dir;
-
         }
-
+        
         /**
          * @param string $array String to split
          *
@@ -73,23 +69,71 @@
          */
         function ShowGallery($array)
         {
-
+            
             $gallery = explode(',', $array);
             if(is_array($gallery)) {
                 array_splice($gallery, -1);
                 return $gallery;
             } else {
-                return [ ];
+                return [];
             }
-
+            
         }
-
-        public function ShowAvatar($dir, $width, $height = NULL) {
-            if(empty($dir)) {
+        
+        public function ShowAvatar($dir, $width, $height = NULL)
+        {
+            if(empty( $dir )) {
                 return '/images/avatar-bg.png';
             } else {
                 return $this->minImg($dir, $width, $height);
             }
         }
-
+    
+        /**
+         * Add watermark to image
+         *
+         * @param string $path image path
+         *
+         * @return yii\base\Component
+         */
+        public function watermark($path)
+        {
+            $watermark_path = Yii::getAlias('@webroot/images/watermark.png');
+            $image = Image::getImagine()
+                          ->open($path);
+            $watermark = Image::getImagine()
+                              ->open($watermark_path);
+            $image_size = $image->getSize();
+            $watermark_size = $watermark->getSize();
+            if($image_size->getWidth() < ($watermark_size->getWidth() + 20) || ($image_size->getHeight() + 20) < $watermark_size->getHeight()) {
+                return $this->owner;
+            }
+            $position_left = $image_size->getWidth() - ($watermark_size->getWidth() + 10);
+            Image::watermark($path, $watermark_path, [$position_left, 10])->save(preg_replace('/^(.*)(\.\w+)$/', '${1}_watermark${2}', $path));
+            return $this->owner;
+        }
+    
+        function getWatermark($path, $width, $height = NULL)
+        {
+            if($width == 'original') {
+                $path_original = $this->minImg($path, 'original');
+                $path_watermark = str_replace('original', 'original_watermark', $path_original);
+                if(!file_exists(Yii::getAlias('@documentRoot').$path_watermark)) {
+                    $this->watermark(Yii::getAlias('@documentRoot').$path_original);
+                }
+                return $path_watermark;
+            } else {
+                $path_original = $this->minImg($path, $width, $height);
+                preg_match('/^.*(\.\w+)$/', $path_original, $extension);
+                $path_watermark = $path_original;
+                if(isset($extension[1])) {
+                    $path_watermark = str_replace($extension[1], '_watermark'.$extension[1], $path_original);
+                }
+                if(!file_exists(Yii::getAlias('@documentRoot').$path_watermark)) {
+                    $this->watermark(Yii::getAlias('@documentRoot').$path_original);
+                }
+                return $path_watermark;
+            }
+        }
+        
     }
 \ No newline at end of file
@@ -10,6 +10,7 @@
     use yii\behaviors\TimestampBehavior;
     use yii\db\ActiveQuery;
     use yii\db\Expression;
+    use yii\base\Component;
  
     /**
      * This is the model class for table "portfolio".
@@ -34,6 +35,8 @@
      * @property Rating[]                  $rating
      * @property string                    $ratingValue
      * @method string minImg( string $dir, $width, $height = NULL ) Resizes image
+     * @method Component watermark(string $path) Add watermark to image
+     * @method string getWatermark(string $path, mixed $width, mixed $height) Get watermarked image
      * @method array ShowGallery( string $array ) Splits string to image paths array
      */
     class Portfolio extends \yii\db\ActiveRecord
@@ -40,7 +40,7 @@
             if(!empty( $portfolio_user )) {
                 echo Html::img($portfolio->minImg(ArrayHelper::getValue($portfolio_user_gallery, 0, ''), '720', '280'));
             } else {
-                echo Html::img($portfolio->minImg($portfolio->cover, '720', '280'));
+                echo Html::img($portfolio->getWatermark($portfolio->cover, '720', '280'));
             }
         ?>
     </div>
@@ -122,7 +122,7 @@
                                     foreach($portfolio->ShowGallery($portfolio->gallery->photo) as $one_photo) {
                                         ?>
                                         <li>
-                                            <img src="<?= $portfolio->minImg($one_photo, 210, 150) ?>" alt=""/>
+                                            <img src="<?= $portfolio->getWatermark($one_photo, 210, 150) ?>" data-original="<?=$portfolio->getWatermark($one_photo, 720, 280)?>" alt=""/>
                                         </li>
                                         <?php
                                     }
@@ -4,9 +4,11 @@
      * @var Blog         $article
      */
     use common\models\Blog;
-
+    use yii\helpers\Html;
+    use yii\helpers\Url;
+    
     $this->params[ 'user' ] = $user;
-
+    
     $this->title = $article->name;
 ?>
 <div class="performer-vacancy-vacant-title-reclam-wr style">
@@ -29,6 +31,22 @@
         <div class="blog-post-content style">
             <?= $article->description ?>
         </div>
+        <div class="share-buttons-new">
+            <p class="share-buttons-new-title">Поделиться</p>
+            <p class="share-buttons-new-link">
+                <?php
+                    echo Html::a(Html::img('/images/ico-vk.png'), 'http://vk.com/share.php?url=' . Url::current([], true), [
+                        'target' => '_blank',
+                    ]);
+                    echo Html::a(Html::img('/images/ico-fb.png'), 'http://www.facebook.com/sharer/sharer.php?u=' . Url::current([], true), [
+                        'target' => '_blank',
+                    ]);
+                    echo Html::a(Html::img('/images/ico-google.png'), 'https://plus.google.com/share?url=' . Url::current([], true), [
+                        'target' => '_blank',
+                    ]);
+                ?>
+            </p>
+        </div>
     </div>
 </div>
 <?php
@@ -7,6 +7,7 @@
     use yii\helpers\ArrayHelper;
     use yii\helpers\Html;
     use yii\helpers\Url;
+    use yii\imagine\Image;
     use yii\web\ViewAction;
     use yii\web\View;
     use yii\widgets\Pjax;
@@ -42,7 +43,7 @@
             if(!empty( $portfolio_user )) {
                 echo Html::img($portfolio->minImg(ArrayHelper::getValue($portfolio_user_gallery, 0, ''), '720', '280'));
             } else {
-                echo Html::img($portfolio->minImg($portfolio->cover, '720', '280'));
+                echo Html::img($portfolio->getWatermark($portfolio->cover, '720', '280'));
             }
         ?>
     </div>
@@ -124,7 +125,7 @@
                                     foreach($portfolio->ShowGallery($portfolio->gallery->photo) as $one_photo) {
                                         ?>
                                         <li>
-                                            <img src="<?= $portfolio->minImg($one_photo, 210, 150) ?>" alt="" data-original="<?=$portfolio->minImg($one_photo, 720, 280)?>"/>
+                                            <img src="<?= $portfolio->getWatermark($one_photo, 210, 150) ?>" alt="" data-original="<?=$portfolio->getWatermark($one_photo, 720, 280)?>"/>
                                         </li>
                                         <?php
                                     }
@@ -141,7 +142,6 @@
             }
         ?>
     </div>
-
     <div class="new-portfolio-txt-wrapper style">
         <div class="new-portfolio-excerpt style">
             <?php
@@ -12623,4 +12623,17 @@ li.active-menu-admin:hover a .ico_num {
  
 .left-search-work .admin-specialization-selected ul li:before {
     right: 8px;
+}
+.share-buttons-new {
+    margin-top: 10px;
+    float: left;
+}
+.share-buttons-new .share-buttons-new-title {
+    text-transform: uppercase;
+    font-size: 15px;
+    font-weight: bold;
+}
+.share-buttons-new .share-buttons-new-link a {
+    margin-top: 5px;
+    margin-right: 10px;
 }
 \ No newline at end of file
-RewriteEngine on
-RewriteBase /
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteCond %{REQUEST_FILENAME} !-d
-
-RewriteRule . index.php
+RewriteEngine on
+RewriteBase /
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+
+RewriteRule . index.php