Index: /extensions/GMaps/admin/gmaps_category_maps.tpl
===================================================================
--- /extensions/GMaps/admin/gmaps_category_maps.tpl	(revision 10550)
+++ /extensions/GMaps/admin/gmaps_category_maps.tpl	(revision 10551)
@@ -1,8 +1,8 @@
-{known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js"}
-{known_script id="jquery.ui.sortable" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.sortable.packed.js"}
-{known_script id="jquery.ui.dialog" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.dialog.packed.js"}
-{known_script id="gpc.ui.iconSelector" src=$ROOT_URL|@cat:"plugins/GrumPluginClasses/js/ui.iconSelector.packed.js"}
-{known_script id="gpc.ui.categorySelector" src=$ROOT_URL|@cat:"plugins/GrumPluginClasses/js/ui.categorySelector.packed.js"}
-{known_script id="maps.google.com/api" src="http://maps.google.com/maps/api/js?sensor=false"}
+{combine_script  id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"}
+{combine_script  id="jquery.ui.sortable" path="themes/default/js/ui/minified/jquery.ui.sortable.min.js"}
+{combine_script  id="jquery.ui.dialog" path="themes/default/js/ui/minified/jquery.ui.dialog.min.js"}
+{combine_script  id="gpc.ui.iconSelector" path="plugins/GrumPluginClasses/js/ui.iconSelector.min.js" require="jquery"}
+{combine_script  id="gpc.ui.categorySelector" path="plugins/GrumPluginClasses/js/ui.categorySelector.min.js" require="jquery"}
+{combine_script  id="maps.google.com/api" path="http://maps.google.com/maps/api/js?sensor=false"}
 
 {literal}
Index: /extensions/GMaps/admin/gmaps_config.tpl
===================================================================
--- /extensions/GMaps/admin/gmaps_config.tpl	(revision 10550)
+++ /extensions/GMaps/admin/gmaps_config.tpl	(revision 10551)
@@ -1,4 +1,4 @@
-{known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js"}
-{known_script id="jquery.ui.slider" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.slider.packed.js"}
+{combine_script  id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"}
+{combine_script  id="jquery.ui.slider" path="themes/default/js/ui/minified/jquery.ui.slider.min.js"}
 
 <h2>{'gmaps_config'|@translate}</h2>
Index: /extensions/GMaps/admin/gmaps_kmlfiles.tpl
===================================================================
--- /extensions/GMaps/admin/gmaps_kmlfiles.tpl	(revision 10550)
+++ /extensions/GMaps/admin/gmaps_kmlfiles.tpl	(revision 10551)
@@ -1,5 +1,5 @@
-{known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js"}
-{known_script id="jquery.ui.sortable" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.sortable.packed.js"}
-{known_script id="jquery.ui.dialog" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.dialog.packed.js"}
+{combine_script  id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"}
+{combine_script  id="jquery.ui.sortable" path="themes/default/js/ui/minified/jquery.ui.sortable.min.js"}
+{combine_script  id="jquery.ui.dialog" path="themes/default/js/ui/minified/jquery.ui.dialog.min.js"}
 
 {literal}
Index: /extensions/GMaps/admin/gmaps_maps.tpl
===================================================================
--- /extensions/GMaps/admin/gmaps_maps.tpl	(revision 10550)
+++ /extensions/GMaps/admin/gmaps_maps.tpl	(revision 10551)
@@ -1,6 +1,6 @@
-{known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js"}
-{known_script id="jquery.ui.dialog" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.dialog.packed.js"}
-{known_script id="jquery.ui.slider" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.slider.packed.js"}
-{known_script id="maps.google.com/api" src="http://maps.google.com/maps/api/js?sensor=false"}
+{combine_script  id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"}
+{combine_script  id="jquery.ui.dialog" path="themes/default/js/ui/minified/jquery.ui.dialog.min.js"}
+{combine_script  id="jquery.ui.slider" path="themes/default/js/ui/minified/jquery.ui.slider.min.js"}
+{combine_script  id="maps.google.com/api" path="http://maps.google.com/maps/api/js?sensor=false"}
 
 <!--
Index: /extensions/GMaps/gmaps_ajax.php
===================================================================
--- /extensions/GMaps/gmaps_ajax.php	(revision 10550)
+++ /extensions/GMaps/gmaps_ajax.php	(revision 10551)
@@ -19,4 +19,5 @@
  */
 
+  // in this case, PHPWG_ROOT_PATH must be declared as an absolute path...
   define('PHPWG_ROOT_PATH',dirname(dirname(dirname(__FILE__))).'/');
 
@@ -871,5 +872,5 @@
         }
 
-        $file=GPCCore::getPiwigoSystemPath().self::KML_DIRECTORY.$file;
+        $file=GPCCore::getPiwigoSystemPath().PWG_LOCAL_DIR.self::KML_DIRECTORY.$file;
 
         if(file_exists($file)) unlink($file);
@@ -877,5 +878,5 @@
         {
           $currentInfo=$this->ajax_gmaps_admin_kmlFilesGetFile($id, false);
-          if(file_exists(self::KML_DIRECTORY.$currentInfo['file'])) unlink(GPCCore::getPiwigoSystemPath().self::KML_DIRECTORY.$currentInfo['file']);
+          if(file_exists(GPCCore::getPiwigoSystemPath().PWG_LOCAL_DIR.self::KML_DIRECTORY.$currentInfo['file'])) unlink(GPCCore::getPiwigoSystemPath().PWG_LOCAL_DIR.self::KML_DIRECTORY.$currentInfo['file']);
         }
 
@@ -1008,7 +1009,7 @@
       if($result)
       {
-        if($file!='' and file_exists(GPCCore::getPiwigoSystemPath().self::KML_DIRECTORY.$file))
-        {
-          unlink(GPCCore::getPiwigoSystemPath().self::KML_DIRECTORY.$file);
+        if($file!='' and file_exists(GPCCore::getPiwigoSystemPath().PWG_LOCAL_DIR.self::KML_DIRECTORY.$file))
+        {
+          unlink(GPCCore::getPiwigoSystemPath().PWG_LOCAL_DIR.self::KML_DIRECTORY.$file);
         }
         return('ok');
Index: /extensions/GMaps/gmaps_install.class.inc.php
===================================================================
--- /extensions/GMaps/gmaps_install.class.inc.php	(revision 10550)
+++ /extensions/GMaps/gmaps_install.class.inc.php	(revision 10551)
@@ -42,7 +42,7 @@
     public function install()
     {
-      if(!file_exists(GPCCore::getPiwigoSystemPath().self::KML_DIRECTORY))
+      if(!file_exists(GPCCore::getPiwigoSystemPath()."/".PWG_LOCAL_DIR.self::KML_DIRECTORY))
       {
-        mkdir(GPCCore::getPiwigoSystemPath().self::KML_DIRECTORY, 0755, true);
+        mkdir(GPCCore::getPiwigoSystemPath()."/".PWG_LOCAL_DIR.self::KML_DIRECTORY, 0755, true);
       }
 
@@ -123,5 +123,5 @@
     public function uninstall()
     {
-      GPCCore::rmDir(dirname(GPCCore::getPiwigoSystemPath().self::KML_DIRECTORY));
+      GPCCore::rmDir(dirname(GPCCore::getPiwigoSystemPath()."/".PWG_LOCAL_DIR.self::KML_DIRECTORY));
       $this->deleteConfig();
       $this->tablef->drop();
@@ -176,6 +176,6 @@
     private function updateFrom_010000()
     {
-      if(!file_exists(GPCCore::getPiwigoSystemPath().self::KML_DIRECTORY))
-          mkdir(GPCCore::getPiwigoSystemPath().self::KML_DIRECTORY, 0755, true);
+      if(!file_exists(GPCCore::getPiwigoSystemPath()."/".PWG_LOCAL_DIR.self::KML_DIRECTORY))
+          mkdir(GPCCore::getPiwigoSystemPath()."/".PWG_LOCAL_DIR.self::KML_DIRECTORY, 0755, true);
 
       $directory=scandir(GMAPS_PATH.'kml/');
@@ -185,5 +185,5 @@
         if(preg_match('/.*(?:\.kml|\.kmz)$/i', $file))
         {
-          rename(GMAPS_PATH.'kml/'.$file, GPCCore::getPiwigoSystemPath().self::KML_DIRECTORY.$file);
+          rename(GMAPS_PATH.'kml/'.$file, GPCCore::getPiwigoSystemPath()."/".PWG_LOCAL_DIR.self::KML_DIRECTORY.$file);
         }
       }
Index: /extensions/GMaps/gmaps_pip.class.inc.php
===================================================================
--- /extensions/GMaps/gmaps_pip.class.inc.php	(revision 10550)
+++ /extensions/GMaps/gmaps_pip.class.inc.php	(revision 10551)
@@ -126,7 +126,7 @@
       }
 
-      GPCCore::addHeaderJS("jquery", "themes/default/js/jquery.packed.js");
+      GPCCore::addHeaderJS("jquery", "themes/default/js/jquery.min.js");
       GPCCore::addHeaderJS("maps.google.com/api", "http://maps.google.com/maps/api/js?sensor=false");
-      GPCCore::addHeaderJS("gmaps.markup", "plugins/GMaps/js/gmapsMarkup.packed.js");
+      GPCCore::addHeaderJS("gmaps.markup", "plugins/GMaps/js/gmapsMarkup".GPCCore::getMinified().".js", array('jquery'));
 
       $desc = preg_replace(
@@ -156,5 +156,5 @@
             while($row=pwg_db_fetch_assoc($result))
             {
-              $mapParam['kmlUrl']=dirname($_SERVER['SCRIPT_URI']).self::KML_DIRECTORY.$row['file'];
+              $mapParam['kmlUrl']=$_SERVER['SCRIPT_URI'].PWG_LOCAL_DIR.self::KML_DIRECTORY.$row['file'];
             }
           }
@@ -192,5 +192,5 @@
               geolocated:".($nb>0?'true':'false').",
               kmlZoom:".($mapParam['kmlZoom']=='y'?'true':'false').",
-              allowBubble:".($mapParam['allowBubble']=='y'?'true':'false').",
+              allowBubble:".($mapParam['allowBubble']=='y'?'true':'false')."
             }
           ";
@@ -204,5 +204,5 @@
             categoryId:".$page['category']['id'].",
             maps:
-            [".implode(',', $scripts)."],
+            [".implode(',', $scripts)."]
           };
         </script>", false);
@@ -263,5 +263,5 @@
                 markers:[],
                 fitToBounds:true,
-                zoomLevelMaxActivated:".($map['zoomLevelMaxActivated']=='y'?'true':'false').",
+                zoomLevelMaxActivated:".($map['zoomLevelMaxActivated']=='y'?'true':'false')."
               }";
 
@@ -310,5 +310,5 @@
     maps:
     [".implode(',', $scripts)."],
-    popupAutomaticSize:".$this->config['popupAutomaticSize'].",
+    popupAutomaticSize:".$this->config['popupAutomaticSize']."
   };
 </script>", false);
@@ -496,5 +496,5 @@
       {
         latitude:'".$this->picture['coords']['lat']."',
-        longitude:'".$this->picture['coords']['lng']."',
+        longitude:'".$this->picture['coords']['lng']."'
       },
       maps:
Index: /extensions/GMaps/gmaps_root.class.inc.php
===================================================================
--- /extensions/GMaps/gmaps_root.class.inc.php	(revision 10550)
+++ /extensions/GMaps/gmaps_root.class.inc.php	(revision 10551)
@@ -18,5 +18,5 @@
   class GMaps_root extends CommonPlugin
   {
-    const KML_DIRECTORY='/local/plugins/GMaps/kml/';
+    const KML_DIRECTORY='plugins/GMaps/kml/';
     const ID_MODE_CATEGORY = 'C';
     const ID_MODE_MAP='M';
@@ -274,5 +274,5 @@
         {
           // if an kml file id is given, apply the url of the file (needs to give the complete URI for google)
-          if($row['kmlFileId']>0 and $row['kmlFileUrlId']!='') $row['kmlFileUrl']=dirname($_SERVER['SCRIPT_URI']).self::KML_DIRECTORY.rawurlencode($row['kmlFileUrlId']);
+          if($row['kmlFileId']>0 and $row['kmlFileUrlId']!='') $row['kmlFileUrl']=$_SERVER['SCRIPT_URI'].PWG_LOCAL_DIR.self::KML_DIRECTORY.rawurlencode($row['kmlFileUrlId']);
 
           if($row['displayType']!='MP' and $mode==self::ID_MODE_CATEGORY)
Index: /extensions/GMaps/gmaps_version.inc.php
===================================================================
--- /extensions/GMaps/gmaps_version.inc.php	(revision 10550)
+++ /extensions/GMaps/gmaps_version.inc.php	(revision 10551)
@@ -15,7 +15,7 @@
   if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
-  define('GMAPS_VERSION',  '1.2.4');
-  define('GMAPS_VERSION2', '01.02.04');
-  define('GMAPS_GPC_NEEDED', '3.3.2');
-  define('GMAPS_AMD_NEEDED', '0.5.2'); //advanced metadata plugin is needed
+  define('GMAPS_VERSION',  '1.3.0');
+  define('GMAPS_VERSION2', '01.03.00');
+  define('GMAPS_GPC_NEEDED', '3.5.0');
+  define('GMAPS_AMD_NEEDED', '0.6.0'); //advanced metadata plugin is needed
 ?>
Index: /extensions/GMaps/js/gmapsCategory.js
===================================================================
--- /extensions/GMaps/js/gmapsCategory.js	(revision 10550)
+++ /extensions/GMaps/js/gmapsCategory.js	(revision 10551)
@@ -2,6 +2,6 @@
  * -----------------------------------------------------------------------------
  * file: gmapsCategory.js
- * file version: 1.2.0
- * date: 2010-11-04
+ * file version: 1.2.1
+ * date: 2011-04-21
  */
 
@@ -11,5 +11,5 @@
   { w:32, h:32, x:15, y:31 }, // s02
   { w:32, h:32, x:10, y:31 }, // s03
-  { w:30, h:40, x:4, y:39 }, // s04
+  { w:30, h:40, x:4, y:39 } // s04
 ];
 
@@ -39,5 +39,5 @@
           style:properties.mapTypeControl
         },
-      markerTitle:'',
+      markerTitle:''
     }
   );
@@ -452,5 +452,5 @@
         {
           autoOpen:false,
-          width:'auto',
+          width:$('#'+gmaps.maps[i].id).width(),
           height:'auto',
           modal: true,
Index: /extensions/GMaps/js/gmapsCategory.min.js
===================================================================
--- /extensions/GMaps/js/gmapsCategory.min.js	(revision 10551)
+++ /extensions/GMaps/js/gmapsCategory.min.js	(revision 10551)
@@ -0,0 +1,88 @@
+/* file: gmapsCategory.js - v1.2.1 | minified on 2011/04/21 with http://jscompress.com/ */
+var markerImgProp=[null,{w:32,h:32,x:15,y:31},{w:32,h:32,x:15,y:31},{w:32,h:32,x:10,y:31},{w:30,h:40,x:4,y:39}];function createMap(properties,gmapsIndex)
+{var map=new google.maps.Map($("#"+properties.id).get(0),{backgroundColor:'#ffffff',mapTypeId:properties.mapType,zoom:properties.zoomLevel,center:gmaps.bounds.getCenter(),navigationControl:(properties.navigationControl==-1)?false:true,scrollwheel:(properties.navigationControl==-1)?false:true,scaleControl:(properties.scaleControl=='n')?false:true,streetViewControl:(properties.streetViewControl=='n')?false:true,mapTypeControl:(properties.mapTypeControl==-1)?false:true,mapTypeControlOptions:{style:properties.mapTypeControl},markerTitle:''});if(properties.kmlFileUrl!='')
+{kmlFile=new google.maps.KmlLayer(properties.kmlFileUrl,{preserveViewport:true});kmlFile.setMap(map);}
+else
+{kmlFile=null;}
+re=/^mS(\d\d)_.*/i;iM=re.exec(properties.markerImg);if(iM!=null)iM=new Number(iM[1]);if(iM!=null)
+{map.markerImg=new google.maps.MarkerImage('plugins/GMaps/img/'+properties.markerImg,new google.maps.Size(markerImgProp[iM].w,markerImgProp[iM].h),new google.maps.Point(0,0),new google.maps.Point(markerImgProp[iM].x,markerImgProp[iM].y));}
+else
+{map.markerImg=null;}
+map.kmlFile=kmlFile;map.markers=new Array();map.gmapsIndex=gmapsIndex;map.viewportInitialized=false;map.callId=0;properties.gMap=map;}
+function loadMarkers(map)
+{map.callId++;datas={requestId:gmaps.requestId,callId:map.callId,bounds:{north:map.getBounds().getNorthEast().lat(),east:map.getBounds().getNorthEast().lng(),south:map.getBounds().getSouthWest().lat(),west:map.getBounds().getSouthWest().lng()},width:$(map.getDiv()).width(),height:$(map.getDiv()).height(),distanceTreshold:20,loadIndex:map.gmapsIndex,};$('#gmapsLoading').css('display','inline-block');$('#gmapsNbPhotos').html('');$.ajax({type:"POST",url:"plugins/GMaps/gmaps_ajax.php",async:true,data:{ajaxfct:"public.maps.getMarkers",datas:datas},success:function(msg)
+{tmp=$.parseJSON(msg);if(gmaps.maps[tmp.loadIndex].gMap.callId==tmp.callId)
+{tmp.markers.sort(compareMarkers);applyMarkers(gmaps.maps[tmp.loadIndex].gMap,tmp.markers);$('#gmapsLoading').css('display','none');$('#gmapsNbPhotos').html('['+tmp.datas.nbPhotos+']');}}});}
+function applyMarkers(map,markers)
+{if(map.markers.length>0)
+{var i=0;while(i<map.markers.length)
+{newListIndex=markerInList(map.markers[i].uId,markers);if(newListIndex==-1)
+{map.markers[i].marker.setMap(null);map.markers.splice(i,1);}
+else
+{markers.splice(newListIndex,1);i++;}}}
+for(var i=0;i<markers.length;i++)
+{var marker=new google.maps.Marker({position:new google.maps.LatLng(markers[i].lat,markers[i].lng),map:map,title:markers[i].nbImgTxt});if(map.markerImg!=null)marker.setIcon(map.markerImg);marker.info=markers[i];marker.info.displayed=0;map.markers.push({marker:marker,uId:markers[i].uId});google.maps.event.addListener(marker,'click',function()
+{displayWindowInfo(this);});for(var index=0;index<marker.info.imgTn.length;index++)
+{switch(marker.info.imgTn[index].charAt(0))
+{case'G':marker.info.imgTn[index]='./galleries/'+marker.info.imgTn[index].substr(1);break;case'U':marker.info.imgTn[index]='./upload/'+marker.info.imgTn[index].substr(1);break;}}}}
+function compareMarkers(m1,m2)
+{if(m1.uId<m2.uId)
+{return(-1);}
+else if(m1.uId<m2.uId)
+{return(1);}
+return(0);}
+function markerInList(uniqueId,markerList)
+{for(var i=0;i<markerList.length;i++)
+{if(markerList[i].uId==uniqueId)return(i)}
+return(-1);}
+function displayWindowInfo(marker)
+{gmaps.currentInfo=marker.info;gmaps.infoWindow.close();gmaps.infoWindow.setContent($('#iGMapsInfoWindowContent').clone().each(renameId).get(0));gmaps.infoWindow.open(marker.map,marker);displayPictureInfo(gmaps.currentInfo.displayed);}
+function renameId(i,e)
+{if(e.id!='')e.id='c'+e.id;$(e).children().each(renameId);}
+function displayPictureInfo(index)
+{gmaps.currentInfo.displayed=index;if(gmaps.currentInfo.imgName[index]=='')
+{$('#ciGMIWC_title').html(' ');}
+else
+{$('#ciGMIWC_title').html(gmaps.currentInfo.imgName[index]);}
+$('#ciGMIWC_img').attr('src',gmaps.currentInfo.imgTn[index]);$('#ciGMIWC_img').unbind();if(gmaps.currentInfo.imgCatsUrl[index].length==1)
+{$('#ciGMIWC_img').bind('click',function()
+{window.location=gmaps.currentInfo.imgCatsUrl[gmaps.currentInfo.displayed][0];});}
+else
+{$('#ciGMIWC_showcatList').html('');for(var i=0;i<gmaps.currentInfo.imgCatsUrl[index].length;i++)
+{$('#ciGMIWC_showcatList').append('<li><a href="'+gmaps.currentInfo.imgCatsUrl[index][i]+'">'+gmaps.currentInfo.imgCatsNames[index][i]+'</a></li>');}
+$('#ciGMIWC_img, #ciGMIWC_showcat').bind('mouseenter',function(){$('#ciGMIWC_showcat').css('display','block');}).bind('mouseleave',function(){$('#ciGMIWC_showcat').css('display','none');});}
+if(gmaps.currentInfo.nbImg>1)
+{$('#ciGMIWC_picnum').html((index+1)+'/'+gmaps.currentInfo.nbImgTxt);$('#ciWALeft, #ciWARight').css('display','inline-block');}
+else
+{$('#ciGMIWC_picnum').html(gmaps.currentInfo.nbImgTxt);$('#ciWALeft, #ciWARight').css('display','none');}}
+function displayPicturePrev()
+{gmaps.currentInfo.displayed--;if(gmaps.currentInfo.displayed<0)gmaps.currentInfo.displayed=gmaps.currentInfo.nbImg-1;displayPictureInfo(gmaps.currentInfo.displayed);}
+function displayPictureNext()
+{gmaps.currentInfo.displayed++;if(gmaps.currentInfo.displayed>=gmaps.currentInfo.nbImg)gmaps.currentInfo.displayed=0;displayPictureInfo(gmaps.currentInfo.displayed);}
+function fitToBounds(bounds,mapIndex)
+{gmaps.maps[mapIndex].gMap.fitBounds(bounds);if(gmaps.maps[mapIndex].zoomLevelMaxActivated&&gmaps.maps[mapIndex].gMap.getZoom()>gmaps.maps[mapIndex].zoomLevel)
+{gmaps.maps[mapIndex].gMap.setZoom(gmaps.maps[mapIndex].zoomLevel);}}
+function initializeMapViewport(mode,mapIndex)
+{if(mapIndex>-1&&($('#'+gmaps.maps[mapIndex].id+'Content').dialog('isOpen')&&mode=='loaded'||mode=='open')&&(gmaps.maps[mapIndex].gMap.viewportInitialized==false))
+{google.maps.event.trigger(gmaps.maps[mapIndex].gMap,'resize');$('#'+gmaps.maps[mapIndex].id+' span, #'+gmaps.maps[mapIndex].id+' a').css('font-size','55.0%');if(gmaps.geolocated)
+{if(gmaps.maps[mapIndex].fitToBounds)
+{fitToBounds(gmaps.bounds,mapIndex);}
+else
+{gmaps.maps[mapIndex].gMap.setCenter(gmaps.bounds.getCenter());}}
+else
+{fitToBounds(gmaps.maps[mapIndex].gMap.kmlFile.getDefaultViewport(),mapIndex);}
+google.maps.event.addListener(gmaps.maps[mapIndex].gMap,'dragend',function()
+{loadMarkers(this);$('#gmapsBoundMap').css('display','inline');$('#gmapsBoundKml').css('display','inline');});google.maps.event.addListener(gmaps.maps[mapIndex].gMap,'zoom_changed',function()
+{loadMarkers(this);gmaps.infoWindow.close();$('#gmapsBoundMap').css('display','inline');$('#gmapsBoundKml').css('display','inline');});gmaps.maps[mapIndex].gMap.viewportInitialized=true;loadMarkers(gmaps.maps[mapIndex].gMap);}}
+$(window).load(function()
+{gmaps.currentInfo=null;gmaps.bounds=new google.maps.LatLngBounds(new google.maps.LatLng(gmaps.bounds.south,gmaps.bounds.west),new google.maps.LatLng(gmaps.bounds.north,gmaps.bounds.east));gmaps.infoWindow=new google.maps.InfoWindow();google.maps.event.addListener(gmaps.infoWindow,'closeclick',function(){gmaps.infoWindow.setContent('');$('#ciGMIWC_img').unbind();});for(var i=0;i<gmaps.maps.length;i++)
+{createMap(gmaps.maps[i],i);if(gmaps.maps[i].sizeMode=='A')
+{$('#'+gmaps.maps[i].id).css({width:($(window).width()*gmaps.popupAutomaticSize)+'px',height:($(window).height()*gmaps.popupAutomaticSize)+'px'});}
+$('#'+gmaps.maps[i].id+'Content').dialog({autoOpen:false,width:$('#'+gmaps.maps[i].id).width(),height:'auto',modal:true,closeText:'X',dialogClass:'gmapsPopup',title:gmaps.maps[i].title,open:function()
+{$.ajax({type:"POST",url:"plugins/GMaps/gmaps_ajax.php",async:true,data:{ajaxfct:"public.maps.init",category:gmaps.categoryId,mapId:'n'},success:function(msg)
+{gmaps.requestId=msg;for(var i=0;i<gmaps.maps.length;i++)
+{initializeMapViewport('loaded',i);}}});}}).data('index',i);if(gmaps.geolocated)
+{$('div.gmapsPopup div.ui-dialog-titlebar').append('<a href="#" id="gmapsBoundMap" style="display:none;" onclick="fitToBounds(gmaps.bounds, '+i+'); $(this).css(\'display\', \'none\').blur(); return(false);">'+'<span>∴</span></a>');$('#gmapsBoundMap').attr('title',gmaps.lang.boundmap);}
+if(gmaps.maps[i].gMap.kmlFile!=null)
+{$('div.gmapsPopup div.ui-dialog-titlebar').append('<a href="#" id="gmapsBoundKml" onclick="fitToBounds(gmaps.maps['+i+'].gMap.kmlFile.getDefaultViewport(), '+i+'); $(this).css(\'display\', \'none\').blur(); return(false);">'+'<span>∼</span></a>');$('#gmapsBoundKml').attr('title',gmaps.lang.boundkml);}
+$('div.gmapsPopup div.ui-dialog-titlebar').append('<span id="gmapsLoading" style="display:none;"><img src="./plugins/GrumPluginClasses/icons/processing.gif"><span>'+gmaps.lang.loading+'</span></span>');$('#ui-dialog-title-iGMapsIconContent').append('<span id="gmapsNbPhotos"></span>');}});
Index: tensions/GMaps/js/gmapsCategory.packed.js
===================================================================
--- /extensions/GMaps/js/gmapsCategory.packed.js	(revision 10550)
+++ 	(revision )
@@ -1,2 +1,0 @@
-/* file: gmapsCategory.js - v1.2.0 | packed on 2010/11/04 with http://joliclic.free.fr/php/javascript-packer/ */
-eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('u 14=[B,{w:32,h:32,x:15,y:31},{w:32,h:32,x:15,y:31},{w:32,h:32,x:10,y:31},{w:30,h:40,x:4,y:39},];9 2E(l,1d){u 5=m j.3.2W($("#"+l.q).2d(0),{2V:\'#2Z\',34:l.2U,35:l.1p,2O:2.s.1X(),1s:(l.1s==-1)?v:z,2Q:(l.1s==-1)?v:z,2r:(l.2r==\'n\')?v:z,2z:(l.2z==\'n\')?v:z,1K:(l.1K==-1)?v:z,3h:{1t:l.1K},3f:\'\',});7(l.2i!=\'\'){H=m j.3.38(l.2i,{3a:z});H.24(5)}F{H=B}2A=/^3b(\\d\\d)2T.*/i;E=2A.3j(l.Q);7(E!=B)E=m 2S(E[1]);7(E!=B){5.Q=m j.3.3g(\'1h/1H/2t/\'+l.Q,m j.3.3c(14[E].w,14[E].h),m j.3.2e(0,0),m j.3.2e(14[E].x,14[E].y))}F{5.Q=B}5.H=H;5.f=m 2P();5.1d=1d;5.1v=v;5.Y=0;l.k=5}9 1e(5){5.Y++;1c={1q:2.1q,Y:5.Y,s:{2F:5.1l().2j().1I(),2C:5.1l().2j().1N(),2I:5.1l().1T().1I(),2G:5.1l().1T().1N()},17:$(5.1S()).17(),12:$(5.1S()).12(),2R:20,1r:5.1d,};$(\'#1z\').o(\'p\',\'S-1G\');$(\'#1w\').M(\'\');$.2l({2m:"2n",2o:"1h/1H/2k.2B",2f:z,1O:{2g:"2h.3.33",1c:1c},2p:9(1f){L=$.36(1f);7(2.3[L.1r].k.Y==L.Y){L.f.37(21);2a(2.3[L.1r].k,L.f);$(\'#1z\').o(\'p\',\'K\');$(\'#1w\').M(\'[\'+L.1c.3k+\']\')}}})}9 2a(5,f){7(5.f.C>0){u i=0;3i(i<5.f.C){1L=2c(5.f[i].I,f);7(1L==-1){5.f[i].g.24(B);5.f.27(i,1)}F{f.27(1L,1);i++}}}W(u i=0;i<f.C;i++){u g=m j.3.3e({3l:m j.3.1x(f[i].1I,f[i].1N),5:5,R:f[i].1P});7(5.Q!=B)g.3m(5.Q);g.D=f[i];g.D.r=0;5.f.2Y({g:g,I:f[i].I});j.3.16.19(g,\'22\',9(){25(Z)});W(u b=0;b<g.D.J.C;b++){2X(g.D.J[b].3d(0)){1Y\'G\':g.D.J[b]=\'./3W/\'+g.D.J[b].1Q(1);1R;1Y\'U\':g.D.J[b]=\'./3X/\'+g.D.J[b].1Q(1);1R}}}}9 21(1B,1A){7(1B.I<1A.I){N(-1)}F 7(1B.I<1A.I){N(1)}N(0)}9 2c(26,1n){W(u i=0;i<1n.C;i++){7(1n[i].I==26)N(i)}N(-1)}9 25(g){2.6=g.D;2.O.2H();2.O.2K($(\'#3Y\').3Z().1W(1J).2d(0));2.O.1M(g.5,g);1b(2.6.r)}9 1J(i,e){7(e.q!=\'\')e.q=\'c\'+e.q;$(e).3V().1W(1J)}9 1b(b){2.6.r=b;7(2.6.1U[b]==\'\'){$(\'#1V\').M(\'&3U;\')}F{$(\'#1V\').M(2.6.1U[b])}$(\'#11\').1m(\'2u\',2.6.J[b]);$(\'#11\').2D();7(2.6.18[b].C==1){$(\'#11\').1E(\'22\',9(){1a.3Q=2.6.18[2.6.r][0]})}F{$(\'#2b\').M(\'\');W(u i=0;i<2.6.18[b].C;i++){$(\'#2b\').13(\'<23><a 1D="\'+2.6.18[b][i]+\'">\'+2.6.3P[b][i]+\'</a></23>\')}$(\'#11, #1F\').1E(\'3R\',9(){$(\'#1F\').o(\'p\',\'1G\')}).1E(\'3S\',9(){$(\'#1F\').o(\'p\',\'K\')})}7(2.6.1o>1){$(\'#29\').M((b+1)+\'/\'+2.6.1P);$(\'#1Z, #28\').o(\'p\',\'S-1G\')}F{$(\'#29\').M(2.6.1P);$(\'#1Z, #28\').o(\'p\',\'K\')}}9 3T(){2.6.r--;7(2.6.r<0)2.6.r=2.6.1o-1;1b(2.6.r)}9 42(){2.6.r++;7(2.6.r>=2.6.1o)2.6.r=0;1b(2.6.r)}9 T(s,8){2.3[8].k.41(s);7(2.3[8].46&&2.3[8].k.48()>2.3[8].1p){2.3[8].k.49(2.3[8].1p)}}9 2q(1y,8){7(8>-1&&($(\'#\'+2.3[8].q+\'2L\').P(\'3n\')&&1y==\'2x\'||1y==\'1M\')&&(2.3[8].k.1v==v)){j.3.16.47(2.3[8].k,\'43\');$(\'#\'+2.3[8].q+\' t, #\'+2.3[8].q+\' a\').o(\'44-45\',\'3N.0%\');7(2.2y){7(2.3[8].T){T(2.s,8)}F{2.3[8].k.3O(2.s.1X())}}F{T(2.3[8].k.H.2v(),8)}j.3.16.19(2.3[8].k,\'3w\',9(){1e(Z);$(\'#1i\').o(\'p\',\'S\');$(\'#1k\').o(\'p\',\'S\')});j.3.16.19(2.3[8].k,\'3v\',9(){1e(Z);2.O.2H();$(\'#1i\').o(\'p\',\'S\');$(\'#1k\').o(\'p\',\'S\')});2.3[8].k.1v=z;1e(2.3[8].k)}}$(1a).3x(9(){2.6=B;2.s=m j.3.3y(m j.3.1x(2.s.2I,2.s.2G),m j.3.1x(2.s.2F,2.s.2C));2.O=m j.3.3z();j.3.16.19(2.O,\'3u\',9(){2.O.2K(\'\');$(\'#11\').2D()});W(u i=0;i<2.3.C;i++){2E(2.3[i],i);7(2.3[i].3t==\'A\'){$(\'#\'+2.3[i].q).o({17:($(1a).17()*2.2J)+\'2M\',12:($(1a).12()*2.2J)+\'2M\'})}$(\'#\'+2.3[i].q+\'2L\').P({3q:v,17:\'2N\',12:\'2N\',3r:z,3s:\'X\',3B:\'1g\',R:2.3[i].R,1M:9(){$.2l({2m:"2n",2o:"1h/1H/2k.2B",2f:z,1O:{2g:"2h.3.3K",3L:2.3M,3I:\'n\'},2p:9(1f){2.1q=1f;W(u i=0;i<2.3.C;i++){2q(\'2x\',i)}}})}}).1O(\'b\',i);7(2.2y){$(\'V.1g V.1j-P-1C\').13(\'<a 1D="#" q="1i" 1t="p:K;" 2w="T(2.s, \'+i+\'); $(Z).o(\\\'p\\\', \\\'K\\\').2s(); N(v);">\'+\'<t>&3C;</t></a>\');$(\'#1i\').1m(\'R\',2.1u.3E)}7(2.3[i].k.H!=B){$(\'V.1g V.1j-P-1C\').13(\'<a 1D="#" q="1k" 2w="T(2.3[\'+i+\'].k.H.2v(), \'+i+\'); $(Z).o(\\\'p\\\', \\\'K\\\').2s(); N(v);">\'+\'<t>&3G;</t></a>\');$(\'#1k\').1m(\'R\',2.1u.3F)}$(\'V.1g V.1j-P-1C\').13(\'<t q="1z" 1t="p:K;"><2t 2u="./1h/3D/3H/3J.3A"><t>\'+2.1u.3o+\'</t></t>\');$(\'#1j-P-R-3p\').13(\'<t q="1w"></t>\')}});',62,258,'||gmaps|maps||map|currentInfo|if|mapIndex|function||index||||markers|marker|||google|gMap|properties|new||css|display|id|displayed|bounds|span|var|false||||true||null|length|info|iM|else||kmlFile|uId|imgTn|none|tmp|html|return|infoWindow|dialog|markerImg|title|inline|fitToBounds||div|for||callId|this||ciGMIWC_img|height|append|markerImgProp||event|width|imgCatsUrl|addListener|window|displayPictureInfo|datas|gmapsIndex|loadMarkers|msg|gmapsPopup|plugins|gmapsBoundMap|ui|gmapsBoundKml|getBounds|attr|markerList|nbImg|zoomLevel|requestId|loadIndex|navigationControl|style|lang|viewportInitialized|gmapsNbPhotos|LatLng|mode|gmapsLoading|m2|m1|titlebar|href|bind|ciGMIWC_showcat|block|GMaps|lat|renameId|mapTypeControl|newListIndex|open|lng|data|nbImgTxt|substr|break|getDiv|getSouthWest|imgName|ciGMIWC_title|each|getCenter|case|ciWALeft||compareMarkers|click|li|setMap|displayWindowInfo|uniqueId|splice|ciWARight|ciGMIWC_picnum|applyMarkers|ciGMIWC_showcatList|markerInList|get|Point|async|ajaxfct|public|kmlFileUrl|getNorthEast|gmaps_ajax|ajax|type|POST|url|success|initializeMapViewport|scaleControl|blur|img|src|getDefaultViewport|onclick|loaded|geolocated|streetViewControl|re|php|east|unbind|createMap|north|west|close|south|popupAutomaticSize|setContent|Content|px|auto|center|Array|scrollwheel|distanceTreshold|Number|_|mapType|backgroundColor|Map|switch|push|ffffff||||getMarkers|mapTypeId|zoom|parseJSON|sort|KmlLayer||preserveViewport|mS|Size|charAt|Marker|markerTitle|MarkerImage|mapTypeControlOptions|while|exec|nbPhotos|position|setIcon|isOpen|loading|iGMapsIconContent|autoOpen|modal|closeText|sizeMode|closeclick|zoom_changed|dragend|load|LatLngBounds|InfoWindow|gif|dialogClass|there4|GrumPluginClasses|boundmap|boundkml|sim|icons|mapId|processing|init|category|categoryId|55|setCenter|imgCatsNames|location|mouseenter|mouseleave|displayPicturePrev|nbsp|children|galleries|upload|iGMapsInfoWindowContent|clone||fitBounds|displayPictureNext|resize|font|size|zoomLevelMaxActivated|trigger|getZoom|setZoom'.split('|'),0,{}))
Index: /extensions/GMaps/js/gmapsMarkup.js
===================================================================
--- /extensions/GMaps/js/gmapsMarkup.js	(revision 10550)
+++ /extensions/GMaps/js/gmapsMarkup.js	(revision 10551)
@@ -2,6 +2,6 @@
  * -----------------------------------------------------------------------------
  * file: gmapsMarkup.js
- * file version: 1.1.0
- * date: 2010-11-04
+ * file version: 1.1.1
+ * date: 2011-04-13
  */
 
@@ -11,5 +11,5 @@
       { w:32, h:32, x:15, y:31 }, // s02
       { w:32, h:32, x:10, y:31 }, // s03
-      { w:30, h:40, x:4, y:39 }, // s04
+      { w:30, h:40, x:4, y:39 } // s04
     ];
 
@@ -44,5 +44,5 @@
                 style:properties.mapTypeControl
               },
-            markerTitle:'',
+            markerTitle:''
           }
         );
@@ -134,5 +134,5 @@
       height:map.height,
       distanceTreshold:20,
-      loadIndex:map.gmapsIndex,
+      loadIndex:map.gmapsIndex
     };
 
Index: /extensions/GMaps/js/gmapsMarkup.min.js
===================================================================
--- /extensions/GMaps/js/gmapsMarkup.min.js	(revision 10551)
+++ /extensions/GMaps/js/gmapsMarkup.min.js	(revision 10551)
@@ -0,0 +1,79 @@
+/* file: gmapsMarkup.js - v1.1.1 | minified on 2011/04/13 with http://jscompress.com/ */
+var markerImgProp=[null,{w:32,h:32,x:15,y:31},{w:32,h:32,x:15,y:31},{w:32,h:32,x:10,y:31},{w:30,h:40,x:4,y:39}];function markupMaps()
+{this.createMap=function(properties,gmapsIndex)
+{var bounds=new google.maps.LatLngBounds(new google.maps.LatLng(properties.mapBounds.south,properties.mapBounds.west),new google.maps.LatLng(properties.mapBounds.north,properties.mapBounds.east)),map=new google.maps.Map($("#"+properties.id).get(0),{backgroundColor:'#ffffff',mapTypeId:properties.mapType,zoom:properties.zoomLevel,center:bounds.getCenter(),navigationControl:(properties.navigationControl==-1)?false:true,scrollwheel:(properties.navigationControl==-1)?false:true,scaleControl:(properties.scaleControl=='n')?false:true,streetViewControl:(properties.streetViewControl=='n')?false:true,mapTypeControl:(properties.mapTypeControl==-1)?false:true,mapTypeControlOptions:{style:properties.mapTypeControl},markerTitle:''});if(properties.kmlFileUrl!='')
+{kmlFile=new google.maps.KmlLayer(properties.kmlFileUrl,{preserveViewport:true});kmlFile.setMap(map);}
+else
+{kmlFile=null;}
+re=/^mS(\d\d)_.*/i;iM=re.exec(properties.markerImg);if(iM!=null)iM=new Number(iM[1]);if(iM!=null)
+{map.markerImg=new google.maps.MarkerImage('plugins/GMaps/img/'+properties.markerImg,new google.maps.Size(markerImgProp[iM].w,markerImgProp[iM].h),new google.maps.Point(0,0),new google.maps.Point(markerImgProp[iM].x,markerImgProp[iM].y));}
+else
+{map.markerImg=null;}
+map.bounds=bounds;map.kmlFile=kmlFile;map.markers=new Array();map.gmapsIndex=gmapsIndex;map.width=properties.width;map.height=properties.height;map.callId=0;map.allowBubble=properties.allowBubble;map.initialized=false;properties.gMap=map;if(properties.geolocated)
+{if(properties.fitToBounds)
+{fitToBounds(map.bounds,gmapsIndex);}
+else
+{map.setCenter(map.bounds.getCenter());}}
+if(properties.markerVisible)
+{loadMarkers(map);}
+else
+{initializeMapViewport(gmapsIndex);}};var loadMarkers=function(map)
+{if(map.getBounds()==null)return(false);map.callId++;datas={requestId:gmapsMarkup.requestId,callId:map.callId,bounds:{north:map.getBounds().getNorthEast().lat(),east:map.getBounds().getNorthEast().lng(),south:map.getBounds().getSouthWest().lat(),west:map.getBounds().getSouthWest().lng()},width:map.width,height:map.height,distanceTreshold:20,loadIndex:map.gmapsIndex};$.ajax({type:"POST",url:"plugins/GMaps/gmaps_ajax.php",async:true,data:{ajaxfct:"public.maps.getMarkers",datas:datas},success:function(msg)
+{tmp=$.parseJSON(msg);if(gmapsMarkup.maps[tmp.loadIndex].gMap.callId==tmp.callId)
+{tmp.markers.sort(compareMarkers);applyMarkers(gmapsMarkup.maps[tmp.loadIndex].gMap,tmp.markers);initializeMapViewport(tmp.loadIndex);}}});};var applyMarkers=function(map,markers)
+{if(map==null)return(false);if(map.markers.length>0)
+{var i=0;while(i<map.markers.length)
+{newListIndex=markerInList(map.markers[i].uId,markers);if(newListIndex==-1)
+{map.markers[i].marker.setMap(null);map.markers.splice(i,1);}
+else
+{markers.splice(newListIndex,1);i++;}}}
+for(var i=0;i<markers.length;i++)
+{var marker=new google.maps.Marker({position:new google.maps.LatLng(markers[i].lat,markers[i].lng),map:map,title:markers[i].nbImgTxt});if(map.markerImg!=null)marker.setIcon(map.markerImg);marker.info=markers[i];marker.info.displayed=0;map.markers.push({marker:marker,uId:markers[i].uId});if(map.allowBubble)
+{google.maps.event.addListener(marker,'click',function()
+{displayWindowInfo(this);});}
+for(var index=0;index<marker.info.imgTn.length;index++)
+{switch(marker.info.imgTn[index].charAt(0))
+{case'G':marker.info.imgTn[index]='./galleries/'+marker.info.imgTn[index].substr(1);break;case'U':marker.info.imgTn[index]='./upload/'+marker.info.imgTn[index].substr(1);break;}}}};var compareMarkers=function(m1,m2)
+{if(m1.uId<m2.uId)
+{return(-1);}
+else if(m1.uId<m2.uId)
+{return(1);}
+return(0);};var markerInList=function(uniqueId,markerList)
+{for(var i=0;i<markerList.length;i++)
+{if(markerList[i].uId==uniqueId)return(i)}
+return(-1);};var displayWindowInfo=function(marker)
+{gmapsMarkup.currentInfo=marker.info;gmapsMarkup.infoWindow.close();gmapsMarkup.infoWindow.setContent($('#iGMapsInfoWindowContent').clone().each(renameId).get(0));gmapsMarkup.infoWindow.open(marker.map,marker);displayPictureInfo(gmapsMarkup.currentInfo.displayed);};var renameId=function(i,e)
+{if(e.id!='')e.id='c'+e.id;$(e).children().each(renameId);};var displayPictureInfo=function(index)
+{gmapsMarkup.currentInfo.displayed=index;if(gmapsMarkup.currentInfo.imgName[index]=='')
+{$('#ciGMIWC_title').html(' ');}
+else
+{$('#ciGMIWC_title').html(gmapsMarkup.currentInfo.imgName[index]);}
+$('#ciGMIWC_img').attr('src',gmapsMarkup.currentInfo.imgTn[index]);$('#ciGMIWC_img').unbind();if(gmapsMarkup.currentInfo.imgCatsUrl[index].length==1)
+{$('#ciGMIWC_img').bind('click',function()
+{window.location=gmapsMarkup.currentInfo.imgCatsUrl[gmapsMarkup.currentInfo.displayed][0];});}
+else
+{$('#ciGMIWC_showcatList').html('');for(var i=0;i<gmapsMarkup.currentInfo.imgCatsUrl[index].length;i++)
+{$('#ciGMIWC_showcatList').append('<li><a href="'+gmapsMarkup.currentInfo.imgCatsUrl[index][i]+'">'+gmapsMarkup.currentInfo.imgCatsNames[index][i]+'</a></li>');}
+$('#ciGMIWC_img, #ciGMIWC_showcat').bind('mouseenter',function(){$('#ciGMIWC_showcat').css('display','block');}).bind('mouseleave',function(){$('#ciGMIWC_showcat').css('display','none');});}
+if(gmapsMarkup.currentInfo.nbImg>1)
+{$('#ciGMIWC_picnum').html((index+1)+'/'+gmapsMarkup.currentInfo.nbImgTxt);$('#ciWALeft, #ciWARight').css('display','inline-block');}
+else
+{$('#ciGMIWC_picnum').html(gmapsMarkup.currentInfo.nbImgTxt);$('#ciWALeft, #ciWARight').css('display','none');}};this.displayPicturePrev=function()
+{gmapsMarkup.currentInfo.displayed--;if(gmapsMarkup.currentInfo.displayed<0)gmapsMarkup.currentInfo.displayed=gmapsMarkup.currentInfo.nbImg-1;displayPictureInfo(gmapsMarkup.currentInfo.displayed);};this.displayPictureNext=function()
+{gmapsMarkup.currentInfo.displayed++;if(gmapsMarkup.currentInfo.displayed>=gmapsMarkup.currentInfo.nbImg)gmapsMarkup.currentInfo.displayed=0;displayPictureInfo(gmapsMarkup.currentInfo.displayed);};var fitToBounds=function(bounds,mapIndex)
+{gmapsMarkup.maps[mapIndex].gMap.fitBounds(bounds);if(gmapsMarkup.maps[mapIndex].zoomLevelMaxActivated&&gmapsMarkup.maps[mapIndex].gMap.getZoom()>gmapsMarkup.maps[mapIndex].zoomLevel)
+{gmapsMarkup.maps[mapIndex].gMap.setZoom(gmapsMarkup.maps[mapIndex].zoomLevel);}};var initializeMapViewport=function(mapIndex)
+{if(mapIndex>-1&&!gmapsMarkup.maps[mapIndex].gMap.initialized)
+{$('#'+gmapsMarkup.maps[mapIndex].id+' span, #'+gmapsMarkup.maps[mapIndex].id+' a').css('font-size','55.0%');if(gmapsMarkup.maps[mapIndex].markerVisible)
+{google.maps.event.addListener(gmapsMarkup.maps[mapIndex].gMap,'dragend',function()
+{loadMarkers(this);});google.maps.event.addListener(gmapsMarkup.maps[mapIndex].gMap,'zoom_changed',function()
+{loadMarkers(this);gmapsMarkup.infoWindow.close();});}
+if(gmapsMarkup.maps[mapIndex].kmlZoom&&gmapsMarkup.maps[mapIndex].gMap.kmlFile!=null)
+{google.maps.event.addListenerOnce(gmapsMarkup.maps[mapIndex].gMap.kmlFile,'defaultviewport_changed',function()
+{fitToBounds(gmapsMarkup.maps[mapIndex].gMap.kmlFile.getDefaultViewport(),mapIndex);});}
+gmapsMarkup.maps[mapIndex].gMap.initialized=true;}};}
+$(window).load(function()
+{var mm=new markupMaps();gmapsMarkup.currentInfo=null;gmapsMarkup.infoWindow=new google.maps.InfoWindow();google.maps.event.addListener(gmapsMarkup.infoWindow,'closeclick',function(){gmapsMarkup.infoWindow.setContent('');$('#ciGMIWC_img').unbind();});$.ajax({type:"POST",url:"plugins/GMaps/gmaps_ajax.php",async:true,data:{ajaxfct:"public.maps.init",category:gmapsMarkup.categoryId,mapId:'y'},success:function(msg)
+{gmapsMarkup.requestId=msg;for(var i=0;i<gmapsMarkup.maps.length;i++)
+{$('#'+gmapsMarkup.maps[i].id).css({width:gmapsMarkup.maps[i].width+'px',height:gmapsMarkup.maps[i].height+'px'});mm.createMap(gmapsMarkup.maps[i],i);}}});if($('#iGMapsInfoWindow').length==0)
+{$('body').append($('<div/>',{id:'iGMapsInfoWindow',css:{display:'none'},}).append($('<div/>',{id:'iGMapsInfoWindowContent'}).append($('<div/>',{id:'iGMIWC_title',html:'(title)'})).append($('<table/>',{id:'iGMIWC_thumb'}).append($('<tr/>').append($('<td/>',{css:{width:'28px'}}).append($('<div id="iWALeft" onclick="mm.displayPicturePrev();"/>'))).append($('<td/>').append($('<img/>',{id:'iGMIWC_img',src:''}))).append($('<td/>',{css:{width:'28px'}}).append($('<div id="iWARight" onclick="mm.displayPictureNext();">'))))).append($('<div/>',{id:'iGMIWC_picnum',html:'0/0 photo'})).append($('<div/>',{id:'iGMIWC_showcat',css:{display:'none'}}).append($('<span/>',{html:'gmaps_i_show_this_picture_in'})).append($('<ul/>',{id:'iGMIWC_showcatList'})))));}});
Index: tensions/GMaps/js/gmapsMarkup.packed.js
===================================================================
--- /extensions/GMaps/js/gmapsMarkup.packed.js	(revision 10550)
+++ 	(revision )
@@ -1,2 +1,0 @@
-/* file: gmapsMarkup.js - v1.1.0 | packed on 2010/11/04 with http://joliclic.free.fr/php/javascript-packer/ */
-eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('f V=[s,{w:32,h:32,x:15,y:31},{w:32,h:32,x:15,y:31},{w:32,h:32,x:10,y:31},{w:30,h:2M,x:4,y:39},];9 2m(){P.1Q=9(8,S){f z=p l.3.2O(p l.3.1i(8.11.25,8.11.2b),p l.3.1i(8.11.1W,8.11.1X)),5=p l.3.2B($("#"+8.m).1P(0),{2D:\'#2J\',3h:8.3c,3d:8.1n,3f:z.1V(),1g:(8.1g==-1)?E:v,2V:(8.1g==-1)?E:v,21:(8.21==\'n\')?E:v,22:(8.22==\'n\')?E:v,1k:(8.1k==-1)?E:v,3b:{33:8.1k},2Z:\'\',});6(8.1Z!=\'\'){F=p l.3.2Y(8.1Z,{2X:v});F.1T(5)}A{F=s}1Y=/^37(\\d\\d)3e.*/i;C=1Y.3g(8.T);6(C!=s)C=p 38(C[1]);6(C!=s){5.T=p l.3.3a(\'1w/1v/1O/\'+8.T,p l.3.2U(V[C].w,V[C].h),p l.3.1U(0,0),p l.3.1U(V[C].x,V[C].y))}A{5.T=s}5.z=z;5.F=F;5.k=p 2G();5.S=S;5.I=8.I;5.O=8.O;5.Q=0;5.1j=8.1j;5.1e=E;8.q=5;6(8.2H){6(8.12){12(5.z,S)}A{5.2E(5.z.1V())}}6(8.2q){17(5)}A{1m(S)}};f 17=9(5){6(5.Y()==s)N(E);5.Q++;1s={1x:2.1x,Q:5.Q,z:{1W:5.Y().24().1t(),1X:5.Y().24().1h(),25:5.Y().2c().1t(),2b:5.Y().2c().1h()},I:5.I,O:5.O,2R:20,1b:5.S,};$.2t({2u:"2s",2r:"1w/1v/2n.2i",2w:v,2g:{2j:"2k.3.2P",1s:1s},1J:9(1a){M=$.2L(1a);6(2.3[M.1b].q.Q==M.Q){M.k.3i(1G);26(2.3[M.1b].q,M.k);1m(M.1b)}}})};f 26=9(5,k){6(5==s)N(E);6(5.k.u>0){f i=0;3P(i<5.k.u){1l=1A(5.k[i].D,k);6(1l==-1){5.k[i].j.1T(s);5.k.2e(i,1)}A{k.2e(1l,1);i++}}}W(f i=0;i<k.u;i++){f j=p l.3.3H({3I:p l.3.1i(k[i].1t,k[i].1h),5:5,1D:k[i].1q});6(5.T!=s)j.3J(5.T);j.B=k[i];j.B.r=0;5.k.3R({j:j,D:k[i].D});6(5.1j){l.3.Z.13(j,\'1K\',9(){1H(P)})}W(f g=0;g<j.B.J.u;g++){3T(j.B.J[g].3V(0)){2f\'G\':j.B.J[g]=\'./3W/\'+j.B.J[g].1C(1);1F;2f\'U\':j.B.J[g]=\'./3p/\'+j.B.J[g].1C(1);1F}}}};f 1G=9(1f,1c){6(1f.D<1c.D){N(-1)}A 6(1f.D<1c.D){N(1)}N(0)};f 1A=9(1S,1d){W(f i=0;i<1d.u;i++){6(1d[i].D==1S)N(i)}N(-1)};f 1H=9(j){2.7=j.B;2.K.2p();2.K.2x($(\'#1B\').3k().1N(1o).1P(0));2.K.3l(j.5,j);16(2.7.r)};f 1o=9(i,e){6(e.m!=\'\')e.m=\'c\'+e.m;$(e).3m().1N(1o)};f 16=9(g){2.7.r=g;6(2.7.1I[g]==\'\'){$(\'#1M\').H(\'&3u;\')}A{$(\'#1M\').H(2.7.1I[g])}$(\'#X\').3C(\'27\',2.7.J[g]);$(\'#X\').2o();6(2.7.18[g].u==1){$(\'#X\').1u(\'1K\',9(){2h.3A=2.7.18[2.7.r][0]})}A{$(\'#1L\').H(\'\');W(f i=0;i<2.7.18[g].u;i++){$(\'#1L\').o(\'<28><a 3v="\'+2.7.18[g][i]+\'">\'+2.7.3w[g][i]+\'</a></28>\')}$(\'#X, #1p\').1u(\'3y\',9(){$(\'#1p\').t(\'R\',\'2z\')}).1u(\'3x\',9(){$(\'#1p\').t(\'R\',\'14\')})}6(2.7.1r>1){$(\'#2y\').H((g+1)+\'/\'+2.7.1q);$(\'#2v, #2l\').t(\'R\',\'3D-2z\')}A{$(\'#2y\').H(2.7.1q);$(\'#2v, #2l\').t(\'R\',\'14\')}};P.1z=9(){2.7.r--;6(2.7.r<0)2.7.r=2.7.1r-1;16(2.7.r)};P.2d=9(){2.7.r++;6(2.7.r>=2.7.1r)2.7.r=0;16(2.7.r)};f 12=9(z,b){2.3[b].q.3n(z);6(2.3[b].3o&&2.3[b].q.3r()>2.3[b].1n){2.3[b].q.3q(2.3[b].1n)}};f 1m=9(b){6(b>-1&&!2.3[b].q.1e){$(\'#\'+2.3[b].m+\' 23, #\'+2.3[b].m+\' a\').t(\'3M-3Q\',\'3O.0%\');6(2.3[b].2q){l.3.Z.13(2.3[b].q,\'3N\',9(){17(P)});l.3.Z.13(2.3[b].q,\'3s\',9(){17(P);2.K.2p()})}6(2.3[b].2S&&2.3[b].q.F!=s){l.3.Z.2K(2.3[b].q.F,\'2I\',9(){12(2.3[b].q.F.2A(),b)})}2.3[b].q.1e=v}}}$(2h).2W(9(){f 19=p 2m();2.7=s;2.K=p l.3.3F();l.3.Z.13(2.K,\'34\',9(){2.K.2x(\'\');$(\'#X\').2o()});$.2t({2u:"2s",2r:"1w/1v/2n.2i",2w:v,2g:{2j:"2k.3.3t",3B:2.3E,3z:\'y\'},1J:9(1a){2.1x=1a;W(f i=0;i<2.3.u;i++){$(\'#\'+2.3[i].m).t({I:2.3[i].I+\'1R\',O:2.3[i].O+\'1R\'});19.1Q(2.3[i],i)}}});6($(\'#1E\').u==0){$(\'3j\').o($(\'<L/>\',{m:\'1E\',t:{R:\'14\'},}).o($(\'<L/>\',{m:\'1B\'}).o($(\'<L/>\',{m:\'3G\',H:\'(1D)\'})).o($(\'<3U/>\',{m:\'3X\'}).o($(\'<3K/>\').o($(\'<1y/>\',{t:{I:\'29\'}}).o($(\'<L m="3S" 2a="19.1z();"/>\'))).o($(\'<1y/>\').o($(\'<1O/>\',{m:\'3L\',27:\'\'}))).o($(\'<1y/>\',{t:{I:\'29\'}}).o($(\'<L m="2N" 2a="19.2d();">\'))))).o($(\'<L/>\',{m:\'2T\',H:\'0/0 2F\'})).o($(\'<L/>\',{m:\'2Q\',t:{R:\'14\'}}).o($(\'<23/>\',{H:\'35\'})).o($(\'<2C/>\',{m:\'36\'})))))}});',62,246,'||gmapsMarkup|maps||map|if|currentInfo|properties|function||mapIndex||||var|index|||marker|markers|google|id||append|new|gMap|displayed|null|css|length|true||||bounds|else|info|iM|uId|false|kmlFile||html|width|imgTn|infoWindow|div|tmp|return|height|this|callId|display|gmapsIndex|markerImg||markerImgProp|for|ciGMIWC_img|getBounds|event||mapBounds|fitToBounds|addListener|none||displayPictureInfo|loadMarkers|imgCatsUrl|mm|msg|loadIndex|m2|markerList|initialized|m1|navigationControl|lng|LatLng|allowBubble|mapTypeControl|newListIndex|initializeMapViewport|zoomLevel|renameId|ciGMIWC_showcat|nbImgTxt|nbImg|datas|lat|bind|GMaps|plugins|requestId|td|displayPicturePrev|markerInList|iGMapsInfoWindowContent|substr|title|iGMapsInfoWindow|break|compareMarkers|displayWindowInfo|imgName|success|click|ciGMIWC_showcatList|ciGMIWC_title|each|img|get|createMap|px|uniqueId|setMap|Point|getCenter|north|east|re|kmlFileUrl||scaleControl|streetViewControl|span|getNorthEast|south|applyMarkers|src|li|28px|onclick|west|getSouthWest|displayPictureNext|splice|case|data|window|php|ajaxfct|public|ciWARight|markupMaps|gmaps_ajax|unbind|close|markerVisible|url|POST|ajax|type|ciWALeft|async|setContent|ciGMIWC_picnum|block|getDefaultViewport|Map|ul|backgroundColor|setCenter|photo|Array|geolocated|defaultviewport_changed|ffffff|addListenerOnce|parseJSON|40|iWARight|LatLngBounds|getMarkers|iGMIWC_showcat|distanceTreshold|kmlZoom|iGMIWC_picnum|Size|scrollwheel|load|preserveViewport|KmlLayer|markerTitle||||style|closeclick|gmaps_i_show_this_picture_in|iGMIWC_showcatList|mS|Number||MarkerImage|mapTypeControlOptions|mapType|zoom|_|center|exec|mapTypeId|sort|body|clone|open|children|fitBounds|zoomLevelMaxActivated|upload|setZoom|getZoom|zoom_changed|init|nbsp|href|imgCatsNames|mouseleave|mouseenter|mapId|location|category|attr|inline|categoryId|InfoWindow|iGMIWC_title|Marker|position|setIcon|tr|iGMIWC_img|font|dragend|55|while|size|push|iWALeft|switch|table|charAt|galleries|iGMIWC_thumb'.split('|'),0,{}))
Index: /extensions/GMaps/js/gmapsPicture.js
===================================================================
--- /extensions/GMaps/js/gmapsPicture.js	(revision 10550)
+++ /extensions/GMaps/js/gmapsPicture.js	(revision 10551)
@@ -2,6 +2,6 @@
  * -----------------------------------------------------------------------------
  * file: gmapsPicture.js
- * file version: 1.1.0
- * date: 2010-10-20
+ * file version: 1.1.1
+ * date: 2011-04-21
  */
 
@@ -16,5 +16,5 @@
       { w:32, h:32, x:15, y:31 }, // s02
       { w:32, h:32, x:10, y:31 }, // s03
-      { w:30, h:40, x:4, y:39 }, // s04
+      { w:30, h:40, x:4, y:39 } // s04
     ];
 
@@ -37,5 +37,5 @@
                     style:properties.mapTypeControl
                   },
-                markerTitle:'',
+                markerTitle:''
               }
             ),
@@ -181,5 +181,5 @@
         {
           autoOpen:false,
-          width:'auto',
+          width:$('#iGMapsIcon').width(),
           height:'auto',
           modal: true,
Index: /extensions/GMaps/js/gmapsPicture.min.js
===================================================================
--- /extensions/GMaps/js/gmapsPicture.min.js	(revision 10551)
+++ /extensions/GMaps/js/gmapsPicture.min.js	(revision 10551)
@@ -0,0 +1,42 @@
+/* file: gmapsPicture.js - v1.1.1 | minified on 2011/04/21 with http://jscompress.com/ */
+var viewportInitialized={icon:false,meta:false},markerImgProp=[null,{w:32,h:32,x:15,y:31},{w:32,h:32,x:15,y:31},{w:32,h:32,x:10,y:31},{w:30,h:40,x:4,y:39}];function applyMap(properties)
+{var latlng=new google.maps.LatLng(gmaps.coords.latitude,gmaps.coords.longitude),map=new google.maps.Map($("#"+properties.id).get(0),{mapTypeId:properties.mapType,zoom:properties.zoomLevel,center:latlng,navigationControl:(properties.navigationControl==-1)?false:true,scrollwheel:(properties.navigationControl==-1)?false:true,scaleControl:(properties.scaleControl=='n')?false:true,streetViewControl:(properties.streetViewControl=='n')?false:true,mapTypeControl:(properties.mapTypeControl==-1)?false:true,mapTypeControlOptions:{style:properties.mapTypeControl},markerTitle:''}),marker=null;if(gmaps.geolocated)
+{marker=new google.maps.Marker({position:latlng,map:map,title:properties.markerTitle});}
+re=/^mS(\d\d)_.*/i;iM=re.exec(properties.markerImg);if(iM!=null)iM=new Number(iM[1]);if(iM!=null&&marker!=null)
+{var markerImg=new google.maps.MarkerImage('plugins/GMaps/img/'+properties.markerImg,new google.maps.Size(markerImgProp[iM].w,markerImgProp[iM].h),new google.maps.Point(0,0),new google.maps.Point(markerImgProp[iM].x,markerImgProp[iM].y));marker.setIcon(markerImg);}
+if(properties.kmlFileUrl!='')
+{kmlFile=new google.maps.KmlLayer(properties.kmlFileUrl,{preserveViewport:true});}
+else
+{kmlFile=null;}
+map.kmlFile=kmlFile;properties.gMap=map;properties.gMapCenter=latlng;}
+function centerMap(map)
+{if(gmaps.geolocated)
+{map.gMap.setCenter(map.gMapCenter);}
+else
+{fitKmlBounds(map);}}
+function fitKmlBounds(map)
+{if(map.gMap!=null)map.gMap.fitBounds(map.gMap.kmlFile.getDefaultViewport());}
+$(window).load(function()
+{gmaps.popupMapIndex=-1;for(i=0;i<gmaps.maps.length;i++)
+{applyMap(gmaps.maps[i]);gmaps.maps[i].gMap.setCenter(gmaps.maps[i].gMapCenter);$('#'+gmaps.maps[i].id+' span, #'+gmaps.maps[i].id+' a').css('font-size','55.0%');if(gmaps.maps[i].gMap.kmlFile!=null)
+gmaps.maps[i].gMap.kmlFile.setMap(gmaps.maps[i].gMap);if(gmaps.maps[i].displayType=='IP')
+{gmaps.popupMapIndex=i;if(gmaps.maps[i].sizeMode=='A')
+{$('#iGMapsIcon').css({width:($(window).width()*gmaps.popupAutomaticSize)+'px',height:($(window).height()*gmaps.popupAutomaticSize)+'px'});}}}
+if($('#iGMapContent').length>0)
+{tabId=$('#iGMapContent').get(0).parentNode.parentNode.id;tabId='tab'+tabId.toUpperCase().substring(0,1)+tabId.substr(1);$("#"+tabId+" a").bind('click',function()
+{if(viewportInitialized.meta==false)
+{for(i=0;i<gmaps.maps.length;i++)
+{if(gmaps.maps[i].displayType=='MP')
+{google.maps.event.trigger(gmaps.maps[i].gMap,'resize');centerMap(gmaps.maps[i]);$('#'+gmaps.maps[i].id+' span, #'+gmaps.maps[i].id+' a').css('font-size','55.0%');}}
+viewportInitialized.meta=true;}});}
+if($('#iGMapsIconContent').length>0)
+{$('#iGMapsIconContent').dialog({autoOpen:false,width:$('#iGMapsIcon').width(),height:'auto',modal:true,closeText:'X',dialogClass:'gmapsPopup',title:gmaps.maps[gmaps.popupMapIndex].title,open:function()
+{if(viewportInitialized.icon==false&&gmaps.popupMapIndex!=-1)
+{if(gmaps.maps[gmaps.popupMapIndex].gMap.kmlFile!=null)
+gmaps.maps[gmaps.popupMapIndex].gMap.kmlFile.setMap(gmaps.maps[gmaps.popupMapIndex].gMap);google.maps.event.trigger(gmaps.maps[gmaps.popupMapIndex].gMap,'resize');centerMap(gmaps.maps[gmaps.popupMapIndex]);$('#iGMapsIcon span, #iGMapsIcon a').css('font-size','55.0%');viewportInitialized.icon=true;}
+google.maps.event.addListener(gmaps.maps[gmaps.popupMapIndex].gMap,'dragend',function()
+{$('#gmapsCenterMap').css('display','inline');$('#gmapsBoundKml').css('display','inline');});google.maps.event.addListener(gmaps.maps[gmaps.popupMapIndex].gMap,'zoom_changed',function()
+{$('#gmapsCenterMap').css('display','inline');$('#gmapsBoundKml').css('display','inline');});}});if(gmaps.geolocated)
+{$('div.gmapsPopup div.ui-dialog-titlebar').append('<a href="#" id="gmapsCenterMap" style="display:none;" onclick="centerMap(gmaps.maps[gmaps.popupMapIndex]); $(this).css(\'display\', \'none\').blur(); return(false);">'+'<span>•</span></a>');$('#gmapsCenterMap').attr('title',gmaps.lang.centermap);}
+if(gmaps.maps[gmaps.popupMapIndex].gMap.kmlFile!=null)
+{$('div.gmapsPopup div.ui-dialog-titlebar').append('<a href="#" id="gmapsBoundKml" onclick="fitKmlBounds(gmaps.maps[gmaps.popupMapIndex]); $(this).css(\'display\', \'none\').blur(); return(false);">'+'<span>∼</span></a>');$('#gmapsBoundKml').attr('title',gmaps.lang.boundkml);}}});
Index: tensions/GMaps/js/gmapsPicture.packed.js
===================================================================
--- /extensions/GMaps/js/gmapsPicture.packed.js	(revision 10550)
+++ 	(revision )
@@ -1,2 +1,0 @@
-/* file: gmapsPicture.js - v1.1.1 | packed on 2010/10/30 with http://joliclic.free.fr/php/javascript-packer/ */
-eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('12 t={M:b,L:b},s=[f,{w:r,h:r,x:15,y:14},{w:r,h:r,x:15,y:14},{w:r,h:r,x:10,y:14},{w:1X,h:20,x:4,y:1V},];o 1d(5){12 E=l c.3.1Q(2.1D.1T,2.1D.21),9=l c.3.1P($("#"+5.m).1b(0),{1H:5.1I,1E:5.1J,1L:E,U:(5.U==-1)?b:k,1R:(5.U==-1)?b:k,19:(5.19==\'n\')?b:k,16:(5.16==\'n\')?b:k,S:(5.S==-1)?b:k,1G:{1q:5.S},1e:\'\',}),F=f;7(2.V){F=l c.3.22({1U:E,9:9,u:5.1e})}1c=/^1S(\\d\\d)1W.*/i;j=1c.1Z(5.I);7(j!=f)j=l 1N(j[1]);7(j!=f&&F!=f){12 I=l c.3.1F(\'1O/1M/1K/\'+5.I,l c.3.1Y(s[j].w,s[j].h),l c.3.1k(0,0),l c.3.1k(s[j].x,s[j].y));F.2o(I)}7(5.18!=\'\'){g=l c.3.2n(5.18,{2m:k})}1h{g=f}9.g=g;5.6=9;5.Z=E}o C(9){7(2.V){9.6.1f(9.Z)}1h{11(9)}}o 11(9){7(9.6!=f)9.6.2q(9.6.g.2l())}$(P).2p(o(){2.8=-1;17(i=0;i<2.3.G;i++){1d(2.3[i]);2.3[i].6.1f(2.3[i].Z);$(\'#\'+2.3[i].m+\' p, #\'+2.3[i].m+\' a\').e(\'R-N\',\'K.0%\');7(2.3[i].6.g!=f)2.3[i].6.g.1m(2.3[i].6);7(2.3[i].1g==\'2r\'){2.8=i;7(2.3[i].2s==\'A\'){$(\'#O\').e({T:($(P).T()*2.1j)+\'1i\',Q:($(P).Q()*2.1j)+\'1i\'})}}}7($(\'#1l\').G>0){v=$(\'#1l\').1b(0).1a.1a.m;v=\'2k\'+v.2i().28(0,1)+v.23(1);$("#"+v+" a").2j(\'27\',o(){7(t.L==b){17(i=0;i<2.3.G;i++){7(2.3[i].1g==\'26\'){c.3.B.1z(2.3[i].6,\'1r\');C(2.3[i]);$(\'#\'+2.3[i].m+\' p, #\'+2.3[i].m+\' a\').e(\'R-N\',\'K.0%\')}}t.L=k}})}7($(\'#1C\').G>0){$(\'#1C\').W({24:b,T:\'1B\',Q:\'1B\',25:k,2a:\'X\',2b:\'Y\',u:2.3[2.8].u,2g:o(){7(t.M==b&&2.8!=-1){7(2.3[2.8].6.g!=f)2.3[2.8].6.g.1m(2.3[2.8].6);c.3.B.1z(2.3[2.8].6,\'1r\');C(2.3[2.8]);$(\'#O p, #O a\').e(\'R-N\',\'K.0%\');t.M=k}c.3.B.1A(2.3[2.8].6,\'2h\',o(){$(\'#D\').e(\'q\',\'z\');$(\'#H\').e(\'q\',\'z\')});c.3.B.1A(2.3[2.8].6,\'2f\',o(){$(\'#D\').e(\'q\',\'z\');$(\'#H\').e(\'q\',\'z\')})}});7(2.V){$(\'J.Y J.1p-W-1n\').1o(\'<a 1s="#" m="D" 1q="q:13;" 1t="C(2.3[2.8]); $(1y).e(\\\'q\\\', \\\'13\\\').1x(); 1w(b);">\'+\'<p>&2e;</p></a>\');$(\'#D\').1u(\'u\',2.1v.2c)}7(2.3[2.8].6.g!=f){$(\'J.Y J.1p-W-1n\').1o(\'<a 1s="#" m="H" 1t="11(2.3[2.8]); $(1y).e(\\\'q\\\', \\\'13\\\').1x(); 1w(b);">\'+\'<p>&2d;</p></a>\');$(\'#H\').1u(\'u\',2.1v.29)}}});',62,153,'||gmaps|maps||properties|gMap|if|popupMapIndex|map||false|google||css|null|kmlFile|||iM|true|new|id||function|span|display|32|markerImgProp|viewportInitialized|title|tabId||||inline||event|centerMap|gmapsCenterMap|latlng|marker|length|gmapsBoundKml|markerImg|div|55|meta|icon|size|iGMapsIcon|window|height|font|mapTypeControl|width|navigationControl|geolocated|dialog||gmapsPopup|gMapCenter||fitKmlBounds|var|none|31||streetViewControl|for|kmlFileUrl|scaleControl|parentNode|get|re|applyMap|markerTitle|setCenter|displayType|else|px|popupAutomaticSize|Point|iGMapContent|setMap|titlebar|append|ui|style|resize|href|onclick|attr|lang|return|blur|this|trigger|addListener|auto|iGMapsIconContent|coords|zoom|MarkerImage|mapTypeControlOptions|mapTypeId|mapType|zoomLevel|img|center|GMaps|Number|plugins|Map|LatLng|scrollwheel|mS|latitude|position|39|_|30|Size|exec|40|longitude|Marker|substr|autoOpen|modal|MP|click|substring|boundkml|closeText|dialogClass|centermap|sim|bull|zoom_changed|open|dragend|toUpperCase|bind|tab|getDefaultViewport|preserveViewport|KmlLayer|setIcon|load|fitBounds|IP|sizeMode'.split('|'),0,{}))
Index: /extensions/GMaps/main.inc.php
===================================================================
--- /extensions/GMaps/main.inc.php	(revision 10550)
+++ /extensions/GMaps/main.inc.php	(revision 10551)
@@ -2,5 +2,5 @@
 /*
 Plugin Name: GMaps
-Version: 1.2.4
+Version: 1.3.0
 Description: Display and manage (google) maps
 Plugin URI: http://phpwebgallery.net/ext/extension_view.php?eid=454
@@ -91,4 +91,11 @@
 |         |            |   . MySQL 5.1 incompatibility
 |         |            |
+| 1.3.0   | 2011-04-13 | * mantis bug:2148
+|         |            |   . compatibility with piwigo 2.2
+|         |            |
+|         |            | * mantis bug:2062
+|         |            |   . With IE7, comma is not accepted at the end of a JS
+|         |            |     object
+|         |            |
 |         |            |
 |         |            |
Index: /extensions/GMaps/templates/gmaps_category.tpl
===================================================================
--- /extensions/GMaps/templates/gmaps_category.tpl	(revision 10550)
+++ /extensions/GMaps/templates/gmaps_category.tpl	(revision 10551)
@@ -1,7 +1,7 @@
-{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
-{known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js"}
-{known_script id="jquery.ui.dialog" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.dialog.packed.js"}
-{known_script id="maps.google.com/api" src="http://maps.google.com/maps/api/js?sensor=false"}
-{known_script id="gmaps.category" src=$ROOT_URL|@cat:"plugins/GMaps/js/gmapsCategory.packed.js"}
+{combine_script id="jquery" path="themes/default/js/jquery.min.js"}
+{combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"}
+{combine_script id="jquery.ui.dialog" path="themes/default/js/ui/minified/jquery.ui.dialog.min.js"}
+{combine_script id="maps.google.com/api" path="http://maps.google.com/maps/api/js?sensor=false"}
+{combine_script id="gmaps.category" path="plugins/GMaps/js/gmapsCategory.min.js" require="jquery.ui"}
 
 {foreach from=$maps item=map}
Index: /extensions/GMaps/templates/gmaps_dialog_area_choose.tpl
===================================================================
--- /extensions/GMaps/templates/gmaps_dialog_area_choose.tpl	(revision 10550)
+++ /extensions/GMaps/templates/gmaps_dialog_area_choose.tpl	(revision 10551)
@@ -1,5 +1,5 @@
-{known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js"}
-{known_script id="jquery.ui.dialog" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.dialog.packed.js"}
-{known_script id="maps.google.com/api" src="http://maps.google.com/maps/api/js?sensor=false"}
+{combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"}
+{combine_script id="jquery.ui.dialog" path="themes/default/js/ui/minified/jquery.ui.dialog.min.js"}
+{combine_script id="maps.google.com/api" path="http://maps.google.com/maps/api/js?sensor=false"}
 
 
Index: /extensions/GMaps/templates/gmaps_picture_icon.tpl
===================================================================
--- /extensions/GMaps/templates/gmaps_picture_icon.tpl	(revision 10550)
+++ /extensions/GMaps/templates/gmaps_picture_icon.tpl	(revision 10551)
@@ -1,7 +1,7 @@
-{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
-{known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js"}
-{known_script id="jquery.ui.dialog" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.dialog.packed.js"}
-{known_script id="maps.google.com/api" src="http://maps.google.com/maps/api/js?sensor=false"}
-{known_script id="gmaps.picture" src=$ROOT_URL|@cat:"plugins/GMaps/js/gmapsPicture.packed.js"}
+{combine_script id="jquery" path="themes/default/js/jquery.min.js"}
+{combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"}
+{combine_script id="jquery.ui.dialog" path="themes/default/js/ui/minified/jquery.ui.dialog.min.js"}
+{combine_script id="maps.google.com/api" path="http://maps.google.com/maps/api/js?sensor=false"}
+{combine_script id="gmaps.picture" path="plugins/GMaps/js/gmapsPicture.min.js" require="jquery.ui"}
 
 <div id='iGMapsIconContent' style='display:none;'>
Index: /extensions/GMaps/templates/gmaps_picture_meta.tpl
===================================================================
--- /extensions/GMaps/templates/gmaps_picture_meta.tpl	(revision 10550)
+++ /extensions/GMaps/templates/gmaps_picture_meta.tpl	(revision 10551)
@@ -1,5 +1,5 @@
-{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
-{known_script id="maps.google.com/api" src="http://maps.google.com/maps/api/js?sensor=false"}
-{known_script id="gmaps.picture" src=$ROOT_URL|@cat:"plugins/GMaps/js/gmapsPicture.packed.js"}
+{combine_script id="jquery" path="themes/default/js/jquery.min.js"}
+{combine_script id="maps.google.com/api" path="http://maps.google.com/maps/api/js?sensor=false"}
+{combine_script id="gmaps.picture" path="plugins/GMaps/js/gmapsPicture.min.js" require="jquery"}
 
 <div id='iGMapContent' style='text-align:center;'>
