AntonLV vor 11 Jahren
Ursprung
Commit
274d1be913

+ 1 - 1
inc/classes/BxDolTranscoder.php

@@ -812,7 +812,7 @@ class BxDolTranscoder extends BxDol implements iBxDolFactoryObject
      * @param $sName filter name
      * @return array of filter params if filter was found, or false if given filter isn't enabled for the transcoder
      */
-    protected function getFilterParams ($sName)
+    public function getFilterParams ($sName)
     {
         $this->initFilters ();
         foreach ($this->_aObject['filters'] as $aParams)

+ 1 - 1
install/sql/system.sql

@@ -3041,7 +3041,7 @@ CREATE TABLE IF NOT EXISTS `sys_objects_transcoder` (
 INSERT INTO `sys_objects_transcoder` (`object`, `storage_object`, `source_type`, `source_params`, `private`, `atime_tracking`, `atime_pruning`, `ts`, `override_class_name`, `override_class_file`) VALUES 
 ('sys_icon_apple', 'sys_images', 'Storage', 'a:2:{s:6:"object";s:10:"sys_images";s:14:"disable_retina";b:1;}', 'no', '0', '0', '0', '', ''),
 ('sys_icon_facebook', 'sys_images', 'Storage', 'a:2:{s:6:"object";s:10:"sys_images";s:14:"disable_retina";b:1;}', 'no', '0', '0', '0', '', ''),
-('sys_icon_favicon', 'sys_images', 'Storage', 'a:2:{s:6:"object";s:10:"sys_images";s:14:"disable_retina";b:1;}', 'no', '0', '0', '0', '', ''),
+('sys_icon_favicon', 'sys_images', 'Storage', 'a:1:{s:6:"object";s:10:"sys_images";}', 'no', '0', '0', '0', '', ''),
 ('sys_cmts_images_preview', 'sys_cmts_images_preview', 'Storage', 'a:1:{s:6:"object";s:15:"sys_cmts_images";}', 'no', '1', '2592000', '0', '', ''),
 ('sys_custom_images', 'sys_images', 'Storage', 'a:1:{s:6:"object";s:17:"sys_images_custom";}', 'no', '1', '2592000', '0', '', '');
 

+ 1 - 1
studio/template/dsr_icon_preview.html

@@ -3,6 +3,6 @@
         <p>
             <b>__caption__</b>
         </p>
-        <img src="__url__" />
+        <img src="__url__"<bx_if:show_width> width="__width__"</bx_if:show_width><bx_if:show_height> height="__height__"</bx_if:show_height> />
     </div>
 </bx_repeat:images>

+ 17 - 1
studio/template/scripts/BxBaseStudioDesigner.php

@@ -239,9 +239,25 @@ class BxBaseStudioDesigner extends BxDolStudioDesigner
                     break;
                 }
 
+                $aFilterParams = $oTranscoder->getFilterParams('Resize');
+				$bFilterWidth = !empty($aFilterParams['w']);
+				$bFilterHeight = !empty($aFilterParams['h']);
+
                 $aTmplVars['bx_repeat:images'][] = array(
                     'caption' => _t($sTitle),
-                    'url' => $sImageUrl
+                    'url' => $sImageUrl,
+                	'bx_if:show_width' => array(
+                		'condition' => $bFilterWidth,
+                		'content' => array(
+                			'width' => $bFilterWidth ? (int)$aFilterParams['w'] : 0
+                		)
+                	),
+                	'bx_if:show_height' => array(
+                		'condition' => $bFilterHeight,
+                		'content' => array(
+                			'height' => $bFilterHeight ? (int)$aFilterParams['h'] : 0
+                		)
+                	), 
                 );
             }
 

+ 1 - 1
template/scripts/BxBaseFunctions.php

@@ -351,7 +351,7 @@ class BxBaseFunctions extends BxDol implements iBxDolSingleton
             $sImageUrlApl = $this->_oTemplate->getIconUrl('apple-touch-icon.png');
 
         $sRet = '';
-        $sRet .= '<link rel="icon" sizes="16x16" type="image/png" href="' . $sImageUrlFav . '" />';
+        $sRet .= '<link rel="shortcut icon" type="image/x-icon" href="' . $sImageUrlFav . '" />';
         $sRet .= '<link rel="image_src" sizes="100x100" href="' . $sImageUrlFcb . '" />';
         $sRet .= '<link rel="apple-touch-icon" sizes="152x152" href="' . $sImageUrlApl . '" />';