image add size5

models/base/Image.php

@@ -20,9 +20,10 @@ class Image extends Model
     const SIZE_320x180 = 4;
     const SIZE_320alt  = 5;
     const SIZE_HD  = 6;
+    const SIZE_841x473  = 7;
     const SIZE_ORIGINAL = 0;
 
-	const PREFIX_IMG = [self::SIZE_320x180=>'size4', self::SIZE_320alt=>'320', self::SIZE_500x282=>'size3', self::SIZE_680x383=>'size2', self::SIZE_1040x586=>'size1', self::SIZE_HD=>'sizehd', self::SIZE_ORIGINAL=>'origin', self::SIZE_1040x586.'_'=>'size1', self::SIZE_680x383.'_'=>'size2'];
+	const PREFIX_IMG = [self::SIZE_320x180=>'size4', self::SIZE_320alt=>'320', self::SIZE_500x282=>'size3', self::SIZE_680x383=>'size2', self::SIZE_841x473=>'size5', self::SIZE_1040x586=>'size1', self::SIZE_HD=>'sizehd', self::SIZE_ORIGINAL=>'origin', self::SIZE_1040x586.'_'=>'size1', self::SIZE_841x473=>'size5', self::SIZE_680x383.'_'=>'size2'];
 
     public $types = ["webp","jpg"];
     public $post_id = null;

models/base/News.php

@@ -160,6 +160,14 @@ class News extends BaseFrontendClass
 				$ofile = Yii::getAlias('@webroot').'/'.static::$story_dir."/news/$name";
 				$this->generatePreview( $hdfile, $ofile, 1300, 731);
 
+				//			фото на НЧ 841x473
+				$name = basename($id."_size5.webp");
+				$ofile = Yii::getAlias('@webroot').'/'.static::$story_dir."/webp/$name";
+				$this->generatePreview( $hdfile, $ofile, 841, 473);
+				$name = basename($id."_size5.jpg");
+				$ofile = Yii::getAlias('@webroot').'/'.static::$story_dir."/news/$name";
+				$this->generatePreview( $hdfile, $ofile, 841, 473);
+
 				//			фото на в ленту(можно отдавать поисковикам) сюжета 680x383
 				$name = basename($id."_size2.webp");
 				$ofile = Yii::getAlias('@webroot').'/'.static::$story_dir."/webp/$name";

views/news/view.php

@@ -22,8 +22,8 @@ $this->registerJsFile('https://platform-api.sharethis.com/js/sharethis.js#proper
 
 $preview = $model->image;
 
-$retina = $preview->getUrl(Image::SIZE_HD,"jpg");
-$normal = $preview->getUrl(Image::SIZE_1040x586,"webp");
+$retina = $preview->getUrl(Image::SIZE_1040x586,"jpg");
+$normal = $preview->getUrl(Image::SIZE_841x473,"webp");
 $bad = $preview->getUrl(Image::SIZE_680x383,'jpg');
 
 $bad = $bad?$bad:'/images/default.jpg';
@@ -110,8 +110,9 @@ $GLOBALS['type_long'] = ($model->type == 6); //лонгрид
         <div class="picture-cont-16x9">
             <picture class="w-100 youtube-iframe-placeholder" data-link="<?=$model->getYoutubeEmbedLink()?>">
                 <source srcset="<?=$preview->getUrl(Image::SIZE_1040x586,"jpg")?>" media="(min-width: 600px)">
-                <source srcset="<?=$preview->getUrl(Image::SIZE_1040x586,"webp")?>" media="(min-width: 600px)">
-                <img src="<?=$preview->getUrl(Image::SIZE_1040x586)?>" alt="<?=$model->photo_title?>" class="w-100" loading="lazy">
+                <source srcset="<?=$preview->getUrl(Image::SIZE_841x473,"webp")?>" media="(min-width: 600px)">
+                <source srcset="<?=$preview->getUrl(Image::SIZE_680x383,"webp")?>" media="(min-width: 400px)">
+                <img src="<?=$preview->getUrl(Image::SIZE_841x473)?>" alt="<?=$model->photo_title?>" srcset="<?=$preview->getUrl(Image::SIZE_841x473)?>, <?=$preview->getUrl(Image::SIZE_1040x586)?> 2x" class="w-100" loading="lazy">
             </picture>
         </div>
     </div>
@@ -150,7 +151,7 @@ $GLOBALS['type_long'] = ($model->type == 6); //лонгрид
                     <div class="picture-cont-16x9">
                         <picture class="w-100">
                             <source srcset="<?=$normal?>, <?=$retina?> 2x" media="(min-width: 600px)">
-                            <img src="<?=$bad?>" alt="<?=htmlentities($model->photo_title,ENT_QUOTES)?>" title="<?=htmlentities($model->photo_title,ENT_QUOTES)?>" class="w-100">
+                            <img src="<?=$bad?>" alt="<?=htmlentities($model->photo_title,ENT_QUOTES)?>" srcset="<?=$normal?>, <?=$retina?> x2" title="<?=htmlentities($model->photo_title,ENT_QUOTES)?>" class="w-100">
                         </picture>
                     </div>
 

views/site/index/_main_view_item_slider.php

@@ -28,8 +28,8 @@ $className = 'main';
         <div class="picture-cont-16x9" >
             <a href="<?=$model->url?>" title="<?=htmlentities($model->title,ENT_QUOTES)?>">
                 <picture class="w-100" id="fimgb<?=$index?>" >
-                    <source srcset="<?=$preview->getUrl(Image::SIZE_680x383)?>?v=<?=$model->rev?>" media="(min-width: 600px)">
-                    <img src="<?=$preview->getUrl(Image::SIZE_680x383)?>?v=<?=$model->rev?>" srcset="<?=$preview->getUrl(Image::SIZE_320x180)?>?v=<?=$model->rev?> 320w,<?=$preview->getUrl(Image::SIZE_500x282)?>?v=<?=$model->rev?> 500w,<?=$preview->getUrl(Image::SIZE_680x383)?>?v=<?=$model->rev?> 680w" alt="<?=htmlentities($model->photo_title,ENT_QUOTES)?>" class="w-100" loading="lazy" id='mainphoto' <?=$sstr?>>
+                    <source srcset="<?=$preview->getUrl(Image::SIZE_841x473)?>?v=<?=$model->rev?>" media="(min-width: 600px)">
+                    <img src="<?=$preview->getUrl(Image::SIZE_841x473)?>?v=<?=$model->rev?>" srcset="<?=$preview->getUrl(Image::SIZE_320x180)?>?v=<?=$model->rev?> 320w,<?=$preview->getUrl(Image::SIZE_500x282)?>?v=<?=$model->rev?> 500w,<?=$preview->getUrl(Image::SIZE_680x383)?>?v=<?=$model->rev?> 680w" alt="<?=htmlentities($model->photo_title,ENT_QUOTES)?>" class="w-100" loading="lazy" id='mainphoto' <?=$sstr?>>
                 </picture>
             </a>
         </div>