Changeset 17242

Timestamp:

Jul 31, 2012, 8:33:03 AM (12 years ago)

Author:

gbo

Message:

Compliance Map & earth

Location:

extensions/LLGBO2

Files:

• js/jquery_llgboframeresize.js (modified) (1 diff)
• main.inc.php (modified) (8 diffs)

extensions/LLGBO2/js/jquery_llgboframeresize.js

@@ -29 +29 @@
                                  var frbdr = 0;
                                  if (Fr) {
-                                        frbdr = parseInt(Fr.style.borderWidth);
-                                        nFrH = nFrH + FrLstBdr ;
-                                        nFrW = nFrW + FrLstBdr ;
-                                        Fr.style.height = nFrH + "px";
-                                        Fr.style.width = nFrW + "px";}
-                                        FrLstBdr = (frbdr * 2);  
+                                        frbdr = parseInt(Fr.style.borderWidth);}
+                                        FrLstBdr = (frbdr * 2)+FrLstBdr;  
                                 }
                                 elGbo.style.width = (nFrW + FrLstBdr) + "px";

extensions/LLGBO2/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: Look_like_gbo2 
-Version:  2.4.D
+Version:  2.4.G
 Plugin URI: http://phpwebgallery.net/ext/extension_view.php?eid=251
 Author: GBo 
@@ -14 +14 @@
         2.4.F Improvement on frame management first size
                   Frame available on SlideShow. 
+        2.4.G Compliance with plugin RV MAP & EARTH
  */
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
 global $conf; 
-define ('LLGBO_INFO_VERSION','2.4.F');
+define ('LLGBO_INFO_VERSION','2.4.G');
 if (!defined('LLGBO_PATH'))
 {define('LLGBO_PATH' ,get_root_url().'plugins/'.basename(dirname(__FILE__)) . '/');}
@@ -72 +73 @@
 $infofile = $template->get_template_vars('INFO_FILE');
 $current = $template->get_template_vars('current');
-
 //----------------------------------------------------   
 /*       HTML End  frame   on Picture.tpl       */
 //----------------------------------------------------  
-If (($conf['LLGBO_SETTINGS'] [0] == 'true')  ) //Frame
+If (($conf['LLGBO_SETTINGS'] [0] == 'true')    //Frame
+     and ($conf['LLGBO_RENDERCONTENT'] == 'true') )     // $content ok for update
         {       $target = 'picture';
             if ($page['slideshow'] and $conf['light_slideshow'])
@@ -100 +101 @@
                                 $frame_height = $frame_height + ( 2* $lastbrdpx); 
                             $bordcolor = $conf['LLGBO_FRAME'][$x];
-                            $frame_begin = '<div   id="llgboframe'.$x.'" class="llgbo" style="border:'.$bordpx.'px solid '.$bordcolor.';width:'.$frame_width.'px; height:'.$frame_height.'px;">'."\n".$frame_begin;
+                            $frame_begin = '<div   id="llgboframe'.$x.'" class="llgbo" style="border:'.$bordpx.'px solid '.$bordcolor.'">'."\n".$frame_begin;
                                 $lastbrdpx = $bordpx;}
                 }
@@ -122 +123 @@
         {$lang['Show file metadata'] =  'No Metadata';}
         else
+        {
+        if ($conf['show_exif']  == true) // No exif ?
         {$meta = "";
         $u_metadata = $template->get_template_vars('U_METADATA');
@@ -151 +154 @@
                    }
                 } 
-        }       
+          }
+        }
         // Add llgbo requirement to ELEMENT_CONTENT
         $template->set_filenames( array('llgbo_content'=> dirname(__FILE__).'/template/llgbo_content.tpl') );
@@ -172 +176 @@
         
 /*       If ($conf['LLGBO_SETTINGS'] [3]  == 'true' )    switch free    {}  */
-
+$conf['LLGBO_RENDERCONTENT']   = 'false';
 //-----------------------------------------------------------------
 // AN OTHER PLUGIN IS WORKING -> GO BACK
@@ -178 +182 @@
 // frame and navigation on picture  are only available on picture extension     
 $pictExt = substr($element_info['file'],-3);
-if (!in_array ( $pictExt,$conf['picture_ext'])) {  return $content;  ; }        
+if (!in_array ( $pictExt,$conf['picture_ext'])) {  return $content;  ; }
+$conf['LLGBO_RENDERCONTENT']  = 'true'; // $content ok for update
  include_once(LLGBO_PATH.'include/manage_picture_content.php');
 } //end --> llgbo_RenderContent