Changeset 30030 for extensions/LLGBO2

Timestamp:

Oct 13, 2014, 9:58:09 PM (10 years ago)

Author:

gbo

Message:

2.7.D fix bug with frame and theme P0w0
improve compatibility with Automatic Size

Location:

extensions/LLGBO2

Files:

• include/manage_picture_content.php (modified) (2 diffs)
• main.inc.php (modified) (1 diff)

extensions/LLGBO2/include/manage_picture_content.php

@@ -34 +34 @@
                                                 {return $content;}                                              
                 }
+        //--------------Autosize compatibility with out frame -------------------------------------------
+                $autosize_type = $template->get_template_vars('automatic_size');
+                if (isset($autosize_type)) // auto size
+                        { $update_tpl = true ;}
         //-----------------------------------------------------------------
         if (($conf['LLGBO2']['frame'])   ) //Frame
         {       $deriv_type = pwg_get_session_var('picture_deriv', $conf['derivative_default_size']);
                 $PictSizeWH =  $element_info['derivatives'][$deriv_type]->get_size();  // default conf
-                
-                $autosize_type = $template->get_template_vars('automatic_size');
-                
+                                        
                 if (isset($autosize_type)) // auto size
                         {       $PictSizeWH =  $element_info['derivatives'][$autosize_type]->get_size(); 
                                 $update_tpl = true ;}
-                        
+                                
                 if (isset($current['selected_derivative'])) // modus
                         {       $PictSizeWH =  $current['selected_derivative']->get_size(); 
@@ -83 +85 @@
                                                          'GBOCSS' => LLGBO_PATH."css/llgbo_content_".$themestyle.".css" ), true); 
                                                          
-                        $template->set_prefilter('default_content', 'LLGBO_prefilter_Content_Frame');                                                            
+                        $template->set_prefilter('default_content', 'LLGBO_prefilter_Content_Frame');           
+
+                if (isset($conf['automatic_size_width_margin'])) // auto size  must take care of frame size
+                        { $template->assign( array(
+                        'asize_width_margin' => $conf['automatic_size_width_margin'] + $frame_border,
+                        'asize_height_margin' => $conf['automatic_size_height_margin'] + $frame_border,));
+                        $template->parse('asize_picture_js');}  
         } // end frame                                  
 //----------------------------------------------------   

extensions/LLGBO2/main.inc.php

@@ -16 +16 @@
                 2.7.C change PHP array_replace by internal function
                 2.7.D fix bug with frame and theme P0w0
+                        improve compatibility with Automatic Size       
  */
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');