Changeset 7177

Timestamp:

Oct 13, 2010, 10:08:41 PM (14 years ago)

Author:

grum

Message:

Fix bugs on install process ; add street view control management

Location:

extensions/GMaps

Files:

• admin/gmaps_amd_warning.tpl (modified) (1 diff)
• admin/gmaps_maps.tpl (modified) (9 diffs)
• admin/gmaps_maps_iListMaps.tpl (modified) (1 diff)
• gmaps_aip.class.inc.php (modified) (3 diffs)
• gmaps_ajax.php (modified) (9 diffs)
• gmaps_install.class.inc.php (modified) (1 diff)
• gmaps_pip.class.inc.php (modified) (2 diffs)
• gmaps_root.class.inc.php (modified) (4 diffs)
• js/gmapsCategory.js (modified) (1 diff)
• js/gmapsCategory.packed.js (modified) (1 diff)
• js/gmapsPicture.js (modified) (1 diff)
• js/gmapsPicture.packed.js (modified) (1 diff)
• language/en_UK/plugin.lang.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (1 diff)
• maintain.inc.php (modified) (1 diff)
• templates/gmaps_dialog_area_choose.tpl (modified) (1 diff)

extensions/GMaps/admin/gmaps_amd_warning.tpl

@@ -1 @@
-<div class='warning'>
+<div class='warnings'>
 {$gmaps_amd_warning}
 </div>

extensions/GMaps/admin/gmaps_maps.tpl

@@ -125 +125 @@
       //$('#iBDMapNavigationControlPos').bind('change', changeNavigationControlPosition);
       $('#iBDMapScaleControl').bind('change', changeScaleControl);
+      $('#iBDMapStreetViewControl').bind('change', changeStreetViewControl);
 
 
@@ -131 +132 @@
 
 
+    /**
+     *
+     */
+    var changeStreetViewControl = function ()
+    {
+      if(properties.gMap!=null)
+      {
+        properties.gMap.setOptions(
+          {
+            streetViewControl: ($('#iBDMapStreetViewControl').val()=='n')?false:true,
+          }
+        );
+      }
+    }
 
     /**
@@ -319 +334 @@
             },
           markerTitle:'',
+          streetViewControl:($('#iBDMapStreetViewControl').val()=='n')?false:true,
         }
       );
@@ -509 +525 @@
           }
         );
+        $('#iBDMapStreetViewControl').val('n');
 
         properties.gMap=null;
@@ -530 +547 @@
         $('#iBDMapNavigationControlType').val(tmp.navigationControl);
         $('#iBDMapScaleControl').val(tmp.scaleControl);
+        $('#iBDMapStreetViewControl').val(tmp.streetViewControl);
 
         $('#iBDExampleMap').html('').css(
@@ -543 +561 @@
       changeSize($('#iBDMapHeightSliderValue').val(), 'iBDMapHeightSlider');
       changeZoom($('#iBDMapZoomLevelSliderValue').val(), '');
+      changeStreetViewControl($('#iBDMapStreetViewControl').val());
     }
 
@@ -614 +633 @@
         navigationControl:$('#iBDMapNavigationControlType').val(),
         scaleControl:$('#iBDMapScaleControl').val(),
+        streetViewControl:$('#iBDMapStreetViewControl').val(),
         style:'',
       }
@@ -687 +707 @@
     <th style="width:90px;">{'gmaps_googleMapNavigationControl'|@translate}</th>
     <th style="width:90px;">{'gmaps_googleMapScaleControl'|@translate}</th>
+    <th style="width:90px;">{'gmaps_googleMapStreetViewControl'|@translate}</th>
     <th width="40px">&nbsp;</th>
   </tr>
@@ -809 +830 @@
           </tr>
           -->
+
+          <tr>
+            <td>{'gmaps_googleMapStreetViewControl'|@translate}</td>
+            <td>
+              <select id='iBDMapStreetViewControl'>
+                <option value='y'>{'gmaps_y'|@translate}</option>
+                <option value='n'>{'gmaps_n'|@translate}</option>
+              </select>
+            </td>
+          </tr>
 
         </table>

extensions/GMaps/admin/gmaps_maps_iListMaps.tpl

@@ -10 +10 @@
     <td style="width:90px;">{$data.navigationControl}</td>
     <td style="width:90px;">{$data.scaleControl}</td>
+    <td style="width:90px;">{$data.streetViewControl}</td>
 
     <td width="40px">

extensions/GMaps/gmaps_aip.class.inc.php

@@ -17 +17 @@
 include_once(PHPWG_PLUGINS_PATH.'GrumPluginClasses/classes/GPCTables.class.inc.php');
 include_once(PHPWG_PLUGINS_PATH.'GrumPluginClasses/classes/GPCTabSheet.class.inc.php');
+include_once(PHPWG_PLUGINS_PATH.'GrumPluginClasses/classes/GPCRequestBuilder.class.inc.php');
 include_once(PHPWG_ROOT_PATH.'admin/include/tabsheet.class.php');
 
@@ -154 +155 @@
     if(!isset($_REQUEST['fGMaps_tabsheet']))
     {
-      $_REQUEST['fGMaps_tabsheet']="maps";
+      if($this->amdState!='advanced' )
+      {
+        $_REQUEST['fGMaps_tabsheet']="amd_warning";
+      }
+      else
+      {
+        $_REQUEST['fGMaps_tabsheet']="maps";
+      }
     }
 
     if(!($_REQUEST['fGMaps_tabsheet']!="maps" or
          $_REQUEST['fGMaps_tabsheet']!="category_maps" or
-         $_REQUEST['fGMaps_tabsheet']!="amd_warning"
-         //$_REQUEST['fGMaps_tabsheet']!="kml_files" or
-         //$_REQUEST['fGMaps_tabsheet']!="search" or
+         $_REQUEST['fGMaps_tabsheet']!="amd_warning" or
+         $_REQUEST['fGMaps_tabsheet']!="kml_files" or
+         $_REQUEST['fGMaps_tabsheet']!="search"
          //$_REQUEST['fGMaps_tabsheet']!="help"
          )) $_REQUEST['fGMaps_tabsheet']="maps";
@@ -316 +324 @@
       case 'none':
       case 'inactive':
-        $template->assign('gmaps_amd_warning_inactive', sprintf(l10n('gmaps_amd_warning_inactive'), GMAPS_AMD_NEEDED));
+        $template->assign('gmaps_amd_warning', sprintf(l10n('gmaps_amd_warning_inactive'), GMAPS_AMD_NEEDED));
         break;
       case 'basic':
-        $template->assign('gmaps_amd_warning_basic', l10n('gmaps_amd_warning_basic'));
+        $template->assign('gmaps_amd_warning', l10n('gmaps_amd_warning_basic'));
         break;
     }

extensions/GMaps/gmaps_ajax.php

@@ -143 +143 @@
                  isset($_REQUEST['datas']['navigationControl']) &&
                  isset($_REQUEST['datas']['scaleControl']) &&
+                 isset($_REQUEST['datas']['streetViewControl']) &&
                  isset($_REQUEST['datas']['style'])))
             {
@@ -183 +184 @@
               if(!($_REQUEST['datas']['scaleControl']=='y' or
                    $_REQUEST['datas']['scaleControl']=='n')) $_REQUEST['datas']['scaleControl']='y';
+
+              if(!($_REQUEST['datas']['streetViewControl']=='y' or
+                   $_REQUEST['datas']['streetViewControl']=='n')) $_REQUEST['datas']['streetViewControl']='n';
             }
           }
@@ -374 +378 @@
       $datas=Array();
 
-      $sql="SELECT id, name, displayType, sizeMode, width, height, zoomLevel, mapType, mapTypeControl, navigationControl, scaleControl
+      $sql="SELECT id, name, displayType, sizeMode, width, height, zoomLevel, mapType, mapTypeControl, navigationControl, scaleControl, streetViewControl
             FROM ".$this->tables['maps']."
             ORDER BY displayType ASC, name ASC";
@@ -402 +406 @@
           $row['navigationControl']=l10n('gmaps_googleMapNavigationControl_'.$row['navigationControl']);
           $row['scaleControl']=($row['scaleControl']=='y')?l10n('gmaps_display_visible'):l10n('gmaps_display_hidden');
+          $row['streetViewControl']=($row['streetViewControl']=='y')?l10n('gmaps_display_visible'):l10n('gmaps_display_hidden');
           $datas[]=$row;
         }
@@ -437 +442 @@
                 $properties['navigationControl']."', '".
                 $properties['scaleControl']."', '".
+                $properties['streetViewControl']."', '".
                 mysql_escape_string($properties['style'])."');";
         $result=pwg_query($sql);
@@ -447 +453 @@
                 $properties['displayType']."', sizeMode='".
                 $properties['sizeMode']."', width='".
-                $properties['mapId']."', width='".
                 $properties['width']."', height='".
                 $properties['height']."', zoomLevel='".
@@ -454 +459 @@
                 $properties['mapTypeControl']."', navigationControl='".
                 $properties['navigationControl']."', scaleControl='".
-                $properties['scaleControl']."', style='".
+                $properties['scaleControl']."', streetViewControl='".
+                $properties['streetViewControl']."', style='".
                 mysql_escape_string($properties['style'])."'
               WHERE id='$id';";
@@ -483 +489 @@
         'mapTypeControl' => 0,
         'navigationControl' => 0,
-        'scaleControl' => 'y'
+        'scaleControl' => 'y',
+        'streetViewControl' => 'n'
       );
 
-      $sql="SELECT id, displayType, sizeMode, name, width, height, zoomLevel, mapType, mapTypeControl, navigationControl, scaleControl
+      $sql="SELECT id, displayType, sizeMode, name, width, height, zoomLevel, mapType, mapTypeControl, navigationControl, scaleControl, streetViewControl
             FROM ".$this->tables['maps']."
             WHERE id='$id';";
@@ -1006 +1013 @@
       global $prefixeTable, $template, $user, $conf;
 
-      $returned='';
+      $requestId='';
 
       $this->buildMapList($category, 'C');

extensions/GMaps/gmaps_install.class.inc.php

@@ -60 +60 @@
   `navigationControl` smallint(6) NOT NULL default '0',
   `scaleControl` char(1) NOT NULL default 'y',
+  `streetViewControl` char(1) NOT NULL default 'n',
   `style` varchar(512) NOT NULL,
   PRIMARY KEY  (`id`)

extensions/GMaps/gmaps_pip.class.inc.php

@@ -172 +172 @@
                 navigationControl:'".$map['navigationControl']."',
                 scaleControl:'".$map['scaleControl']."',
+                streetViewControl:'".$map['streetViewControl']."',
                 kmlFileUrl:'".$map['kmlFileUrl']."',
                 displayType:'".$map['displayType']."',
@@ -374 +375 @@
         navigationControl:'".$map['navigationControl']."',
         scaleControl:'".$map['scaleControl']."',
+        streetViewControl:'".$map['streetViewControl']."',
         kmlFileUrl:'".$map['kmlFileUrl']."',
         displayType:'".$map['displayType']."',

extensions/GMaps/gmaps_root.class.inc.php

@@ -14 +14 @@
   --------------------------------------------------------------------------- */
   include_once(PHPWG_PLUGINS_PATH.'GrumPluginClasses/classes/CommonPlugin.class.inc.php');
+  include_once(PHPWG_PLUGINS_PATH.'GrumPluginClasses/classes/GPCCss.class.inc.php');
 
   class GMaps_root extends CommonPlugin
   {
     protected $css;
+    protected $maps=array();
 
     /**
@@ -64 +66 @@
         GPCCore::loadConfig('amd', $amdConfig);
 
-        return($amdConfig['amd_InterfaceMode']);
-      }
+        if($amdConfig['newInstall']=='n') return($amdConfig['amd_InterfaceMode']);
+      }
+
+      return('none');
     }
 
@@ -188 +192 @@
     {
       global $template ;
+
+      $this->maps=array();
 
       if($page=='C')
@@ -207 +213 @@
               pgmm.displayType, pgmm.sizeMode,
               pgmm.width, pgmm.height, pgmm.zoomLevel,
-              pgmm.mapType, pgmm.mapTypeControl, pgmm.scaleControl,
+              pgmm.mapType, pgmm.mapTypeControl, pgmm.scaleControl, pgmm.streetViewControl,
               pgmm.navigationControl, pgmm.style,
               IF(pgcm.categoryId=0, 0, pct.global_rank) AS priorityRank

extensions/GMaps/js/gmapsCategory.js

@@ -34 +34 @@
       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:

extensions/GMaps/js/gmapsCategory.packed.js

@@ -1 +1 @@
 /* file: gmapsCategory.js - v1.0.0 | packed on 2010/10/13 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}('E O,11=[q,{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:2O,x:4,y:39},];7 2z(l,1w){E 5=o g.3.2M($("#"+l.t).25(0),{2T:\'#2H\',2E:l.2R,3j:l.2V,3c:2.v.2s(),1q:(l.1q==-1)?z:C,3b:(l.1q==-1)?z:C,1U:(l.1U==\'n\')?z:C,1A:(l.1A==-1)?z:C,38:{1s:l.1A},35:\'\',});9(l.1R!=\'\'){I=o g.3.36(l.1R,{34:C})}G{I=q}1S=/^33(\\d\\d)2W.*/i;D=1S.2Y(l.T);9(D!=q)D=o 2Z(D[1]);9(D!=q){5.T=o g.3.3g(\'1f/1n/2h/\'+l.T,o g.3.3f(11[D].w,11[D].h),o g.3.1T(0,0),o g.3.1T(11[D].x,11[D].y))}G{5.T=q}5.I=I;5.f=o 2G();5.1w=1w;l.m=5;l.1E=z}7 1c(5){1b={1L:2.1L,v:{2q:5.1d().2b().1H(),2D:5.1d().2b().1G(),1N:5.1d().1X().1H(),2e:5.1d().1X().1G()},K:$(5.1Z()).K(),M:$(5.1Z()).M(),2U:20};O=5;$(\'#1p\').j(\'k\',\'P-14\');$(\'#1r\').L(\'\');$(\'#29\').j({K:$(\'#1h\').K()+\'S\',M:$(\'#1h\').M()+\'S\',21:$(\'#1h\').1K().21+\'S\',2c:$(\'#1h\').1K().2c+\'S\',k:\'14\'});$.2y({2l:"2m",2i:"1f/1n/2f.2g",2n:C,1j:{2o:"2u.3.2Q",1b:1b},2v:7(13){12=$.2P(13);12.f.2L(1W);22(O,12.f);$(\'#1p\').j(\'k\',\'F\');$(\'#1r\').L(\'[\'+12.1b.3a+\']\');$(\'#29\').j(\'k\',\'F\')}})}7 22(5,f){9(O==q)H(z);9(5.f.N>0){E i=0;3k(i<5.f.N){1I=1Y(5.f[i].B,f);9(1I==-1){5.f[i].r.2r(q);5.f.23(i,1)}G{f.23(1I,1);i++}}}18(E i=0;i<f.N;i++){E r=o g.3.3O({1K:o g.3.1v(f[i].1H,f[i].1G),5:O,R:f[i].1m});9(5.T!=q)r.3P(5.T);r.1o=f[i];r.1o.s=0;5.f.3J({r:r,B:f[i].B});g.3.W.1a(r,\'27\',7(){24(U)})}O=q}7 1W(1M,1J){9(1M.B<1J.B){H(-1)}G 9(1M.B<1J.B){H(1)}H(0)}7 1Y(B,1z){18(E i=0;i<1z.N;i++){9(1z[i].B==B)H(i)}H(-1)}7 24(r){2.6=r.1o;2.J.2p();2.J.2C($(\'#2A\').3T().2a(1l).25(0));2.J.2k(r.5,r);19(2.6.s)}7 1l(i,e){9(e.t!=\'\')e.t=\'c\'+e.t;$(e).3F().2a(1l)}7 19(p){2.6.s=p;9(2.6.26[p]==\'\'){$(\'#1V\').L(\'&3r;\')}G{$(\'#1V\').L(2.6.26[p])}$(\'#Y\').1x(\'2j\',\'./3s/\'+2.6.3t[p]);$(\'#Y\').2B();9(2.6.17[p].N==1){$(\'#Y\').1y(\'27\',7(){16.3p=2.6.17[2.6.s][0]})}G{$(\'#28\').L(\'\');18(E i=0;i<2.6.17[p].N;i++){$(\'#28\').Q(\'<2d><a 1F="\'+2.6.17[p][i]+\'">\'+2.6.3m[p][i]+\'</a></2d>\')}$(\'#Y, #1t\').1y(\'3o\',7(){$(\'#1t\').j(\'k\',\'14\')}).1y(\'3u\',7(){$(\'#1t\').j(\'k\',\'F\')})}9(2.6.1B>1){$(\'#1O\').L((p+1)+\'/\'+2.6.1m);$(\'#1P, #1Q\').j(\'k\',\'P-14\')}G{$(\'#1O\').L(2.6.1m);$(\'#1P, #1Q\').j(\'k\',\'F\')}}7 3E(){2.6.s--;9(2.6.s<0)2.6.s=2.6.1B-1;19(2.6.s)}7 3B(){2.6.s++;9(2.6.s>=2.6.1B)2.6.s=0;19(2.6.s)}$(16).3w(7(){2.6=q;2.v=o g.3.3y(o g.3.1v(2.v.1N,2.v.2e),o g.3.1v(2.v.2q,2.v.2D));2.J=o g.3.3z();g.3.W.1a(2.J,\'3x\',7(){$(\'3A\').Q($(\'#2A\'));2.J.2C(\'\');$(\'#Y\').2B()});18(E i=0;i<2.3.N;i++){2z(2.3[i],i);9(2.3[i].3D==\'A\'){$(\'#\'+2.3[i].t).j({K:($(16).K()*0.8)+\'S\',M:($(16).M()*0.8)+\'S\'})}$(\'#\'+2.3[i].t+\'3C\').Z({3v:z,K:\'2x\',M:\'2x\',3n:C,3l:\'X\',3G:\'1e\',R:2.3[i].R,2k:7(){2.b=$(U).1j(\'p\');$.2y({2l:"2m",2i:"1f/1n/2f.2g",2n:C,1j:{2o:"2u.3.3N",3I:2.3M},2v:7(13){2.1L=13;9(2.3[2.b].1E==z){g.3.W.3L(2.3[2.b].m,\'3U\');9(2.3[2.b].3K){2.3[2.b].m.1D(2.v)}G{2.3[2.b].m.3Q(2.v.2s())}$(\'#\'+2.3[2.b].t+\' u, #\'+2.3[2.b].t+\' a\').j(\'3R-3S\',\'3H.0%\');9(2.3[2.b].m.I!=q)2.3[2.b].m.I.2r(2.3[2.b].m);g.3.W.1a(2.3[2.b].m,\'3q\',7(){1c(U);$(\'#1k\').j(\'k\',\'P\');$(\'#1i\').j(\'k\',\'P\')});g.3.W.1a(2.3[2.b].m,\'2N\',7(){1c(U);2.J.2p();$(\'#1k\').j(\'k\',\'P\');$(\'#1i\').j(\'k\',\'P\')});1c(2.3[2.b].m);2.3[2.b].1E=C}}})}}).1j(\'p\',i);$(\'V.1e V.1g-Z-1u\').Q(\'<a 1F="#" t="1k" 1s="k:F;" 2t="2.3[2.b].m.1D(2.v); $(U).j(\\\'k\\\', \\\'F\\\').2w(); H(z);">\'+\'<u>&2S;</u></a>\');$(\'#1k\').1x(\'R\',2.1C.2K);9(2.3[i].m.I!=q){$(\'V.1e V.1g-Z-1u\').Q(\'<a 1F="#" t="1i" 2t="2.3[2.b].m.1D(2.3[2.b].m.I.2F()); $(U).j(\\\'k\\\', \\\'F\\\').2w(); H(z);">\'+\'<u>&2J;</u></a>\');$(\'#1i\').1x(\'R\',2.1C.2I)}$(\'V.1e V.1g-Z-1u\').Q(\'<u t="1p" 1s="k:F;"><2h 2j="./1f/3e/2X/37.3d"><u>\'+2.1C.3h+\'</u></u>\');$(\'#1g-Z-R-3i\').Q(\'<u t="1r"></u>\')}});',62,243,'||gmaps|maps||map|currentInfo|function||if||currentMapLoadIndex||||markers|google|||css|display|properties|gMap||new|index|null|marker|displayed|id|span|bounds||||false||uniqueId|true|iM|var|none|else|return|kmlFile|infoWindow|width|html|height|length|currentMapLoad|inline|append|title|px|markerImg|this|div|event||ciGMIWC_img|dialog||markerImgProp|tmp|msg|block||window|imgCatsUrl|for|displayPictureInfo|addListener|datas|loadMarkers|getBounds|gmapsPopup|plugins|ui|iGMapsIcon|gmapsBoundKml|data|gmapsBoundMap|renameId|nbImgTxt|GMaps|info|gmapsLoading|navigationControl|gmapsNbPhotos|style|ciGMIWC_showcat|titlebar|LatLng|gmapsIndex|attr|bind|markerList|mapTypeControl|nbImages|lang|fitBounds|viewportInitialized|href|lng|lat|newListIndex|m2|position|requestId|m1|south|ciGMIWC_picnum|ciWALeft|ciWARight|kmlFileUrl|re|Point|scaleControl|ciGMIWC_title|compareMarkers|getSouthWest|markerInList|getDiv||top|applyMarkers|splice|displayWindowInfo|get|imgName|click|ciGMIWC_showcatList|iDialogGMapWaiting|each|getNorthEast|left|li|west|gmaps_ajax|php|img|url|src|open|type|POST|async|ajaxfct|close|north|setMap|getCenter|onclick|public|success|blur|auto|ajax|createMap|iGMapsInfoWindowContent|unbind|setContent|east|mapTypeId|getDefaultViewport|Array|ffffff|boundkml|sim|boundmap|sort|Map|zoom_changed|40|parseJSON|getMarkers|mapType|there4|backgroundColor|distanceTreshold|zoomLevel|_|icons|exec|Number||||mS|preserveViewport|markerTitle|KmlLayer|processing|mapTypeControlOptions||nbPhotos|scrollwheel|center|gif|GrumPluginClasses|Size|MarkerImage|loading|iGMapsIconContent|zoom|while|closeText|imgCatsNames|modal|mouseenter|location|dragend|nbsp|galleries|imgTn|mouseleave|autoOpen|load|closeclick|LatLngBounds|InfoWindow|body|displayPictureNext|Content|sizeMode|displayPicturePrev|children|dialogClass|55|category|push|fitToBounds|trigger|categoryId|init|Marker|setIcon|setCenter|font|size|clone|resize'.split('|'),0,{}))
+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}('I O,W=[p,{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:3P,x:4,y:39},];7 2A(k,1B){I 5=o g.3.2W($("#"+k.s).23(0),{3e:\'#38\',2Y:k.2X,2Z:k.2I,3V:2.B.2r(),1m:(k.1m==-1)?u:z,2R:(k.1m==-1)?u:z,1T:(k.1T==\'n\')?u:z,1V:(k.1V==\'n\')?u:z,1t:(k.1t==-1)?u:z,2S:{1z:k.1t},3d:\'\',});9(k.1O!=\'\'){F=o g.3.3i(k.1O,{3g:z})}E{F=p}1N=/^3a(\\d\\d)35.*/i;D=1N.36(k.P);9(D!=p)D=o 37(D[1]);9(D!=p){5.P=o g.3.34(\'1h/1p/2n/\'+k.P,o g.3.33(W[D].w,W[D].h),o g.3.29(0,0),o g.3.29(W[D].x,W[D].y))}E{5.P=p}5.F=F;5.f=o 3b();5.1B=1B;k.m=5;k.1J=u}7 1j(5){1a={1F:2.1F,B:{2s:5.1e().28().1M(),2E:5.1e().28().1G(),1S:5.1e().2a().1M(),2f:5.1e().2a().1G()},K:$(5.1Y()).K(),J:$(5.1Y()).J(),2K:20};O=5;$(\'#1y\').l(\'j\',\'R-14\');$(\'#1l\').M(\'\');$(\'#1U\').l({K:$(\'#1i\').K()+\'Q\',J:$(\'#1i\').J()+\'Q\',1R:$(\'#1i\').1D().1R+\'Q\',22:$(\'#1i\').1D().22+\'Q\',j:\'14\'});$.2k({2j:"2g",2h:"1h/1p/2i.2o",2p:z,1k:{2v:"2w.3.2U",1a:1a},2u:7(13){1b=$.2Q(13);1b.f.2M(21);1W(O,1b.f);$(\'#1y\').l(\'j\',\'G\');$(\'#1l\').M(\'[\'+1b.1a.2P+\']\');$(\'#1U\').l(\'j\',\'G\')}})}7 1W(5,f){9(O==p)H(u);9(5.f.N>0){I i=0;3r(i<5.f.N){1I=25(5.f[i].C,f);9(1I==-1){5.f[i].r.2m(p);5.f.1P(i,1)}E{f.1P(1I,1);i++}}}18(I i=0;i<f.N;i++){I r=o g.3.3I({1D:o g.3.1K(f[i].1M,f[i].1G),5:O,V:f[i].1w});9(5.P!=p)r.3k(5.P);r.1r=f[i];r.1r.t=0;5.f.3M({r:r,C:f[i].C});g.3.Y.12(r,\'2c\',7(){24(T)})}O=p}7 21(1H,1L){9(1H.C<1L.C){H(-1)}E 9(1H.C<1L.C){H(1)}H(0)}7 25(C,1x){18(I i=0;i<1x.N;i++){9(1x[i].C==C)H(i)}H(-1)}7 24(r){2.6=r.1r;2.L.2q();2.L.2B($(\'#2D\').3S().1Z(1o).23(0));2.L.2z(r.5,r);19(2.6.t)}7 1o(i,e){9(e.s!=\'\')e.s=\'c\'+e.s;$(e).3G().1Z(1o)}7 19(q){2.6.t=q;9(2.6.27[q]==\'\'){$(\'#26\').M(\'&3E;\')}E{$(\'#26\').M(2.6.27[q])}$(\'#Z\').1n(\'2l\',\'./3s/\'+2.6.3t[q]);$(\'#Z\').2C();9(2.6.17[q].N==1){$(\'#Z\').1A(\'2c\',7(){16.3q=2.6.17[2.6.t][0]})}E{$(\'#2d\').M(\'\');18(I i=0;i<2.6.17[q].N;i++){$(\'#2d\').S(\'<2b><a 1C="\'+2.6.17[q][i]+\'">\'+2.6.3m[q][i]+\'</a></2b>\')}$(\'#Z, #1s\').1A(\'3n\',7(){$(\'#1s\').l(\'j\',\'14\')}).1A(\'3u\',7(){$(\'#1s\').l(\'j\',\'G\')})}9(2.6.1u>1){$(\'#2e\').M((q+1)+\'/\'+2.6.1w);$(\'#1X, #1Q\').l(\'j\',\'R-14\')}E{$(\'#2e\').M(2.6.1w);$(\'#1X, #1Q\').l(\'j\',\'G\')}}7 3C(){2.6.t--;9(2.6.t<0)2.6.t=2.6.1u-1;19(2.6.t)}7 3D(){2.6.t++;9(2.6.t>=2.6.1u)2.6.t=0;19(2.6.t)}$(16).3w(7(){2.6=p;2.B=o g.3.3y(o g.3.1K(2.B.1S,2.B.2f),o g.3.1K(2.B.2s,2.B.2E));2.L=o g.3.3x();g.3.Y.12(2.L,\'3z\',7(){$(\'3A\').S($(\'#2D\'));2.L.2B(\'\');$(\'#Z\').2C()});18(I i=0;i<2.3.N;i++){2A(2.3[i],i);9(2.3[i].3B==\'A\'){$(\'#\'+2.3[i].s).l({K:($(16).K()*0.8)+\'Q\',J:($(16).J()*0.8)+\'Q\'})}$(\'#\'+2.3[i].s+\'3v\').11({3o:u,K:\'2y\',J:\'2y\',3l:z,3p:\'X\',3F:\'1d\',V:2.3[i].V,2z:7(){2.b=$(T).1k(\'q\');$.2k({2j:"2g",2h:"1h/1p/2i.2o",2p:z,1k:{2v:"2w.3.3U",3T:2.3O},2u:7(13){2.1F=13;9(2.3[2.b].1J==u){g.3.Y.3N(2.3[2.b].m,\'3H\');9(2.3[2.b].3L){2.3[2.b].m.1E(2.B)}E{2.3[2.b].m.3K(2.B.2r())}$(\'#\'+2.3[2.b].s+\' v, #\'+2.3[2.b].s+\' a\').l(\'3J-3R\',\'3Q.0%\');9(2.3[2.b].m.F!=p)2.3[2.b].m.F.2m(2.3[2.b].m);g.3.Y.12(2.3[2.b].m,\'2O\',7(){1j(T);$(\'#1g\').l(\'j\',\'R\');$(\'#1f\').l(\'j\',\'R\')});g.3.Y.12(2.3[2.b].m,\'2N\',7(){1j(T);2.L.2q();$(\'#1g\').l(\'j\',\'R\');$(\'#1f\').l(\'j\',\'R\')});1j(2.3[2.b].m);2.3[2.b].1J=z}}})}}).1k(\'q\',i);$(\'U.1d U.1c-11-1q\').S(\'<a 1C="#" s="1g" 1z="j:G;" 2t="2.3[2.b].m.1E(2.B); $(T).l(\\\'j\\\', \\\'G\\\').2x(); H(u);">\'+\'<v>&2L;</v></a>\');$(\'#1g\').1n(\'V\',2.1v.2V);9(2.3[i].m.F!=p){$(\'U.1d U.1c-11-1q\').S(\'<a 1C="#" s="1f" 2t="2.3[2.b].m.1E(2.3[2.b].m.F.2H()); $(T).l(\\\'j\\\', \\\'G\\\').2x(); H(u);">\'+\'<v>&2J;</v></a>\');$(\'#1f\').1n(\'V\',2.1v.3f)}$(\'U.1d U.1c-11-1q\').S(\'<v s="1y" 1z="j:G;"><2n 2l="./1h/3c/3h/3j.2F"><v>\'+2.1v.2G+\'</v></v>\');$(\'#1c-11-V-2T\').S(\'<v s="1l"></v>\')}});',62,244,'||gmaps|maps||map|currentInfo|function||if||currentMapLoadIndex||||markers|google|||display|properties|css|gMap||new|null|index|marker|id|displayed|false|span||||true||bounds|uniqueId|iM|else|kmlFile|none|return|var|height|width|infoWindow|html|length|currentMapLoad|markerImg|px|inline|append|this|div|title|markerImgProp||event|ciGMIWC_img||dialog|addListener|msg|block||window|imgCatsUrl|for|displayPictureInfo|datas|tmp|ui|gmapsPopup|getBounds|gmapsBoundKml|gmapsBoundMap|plugins|iGMapsIcon|loadMarkers|data|gmapsNbPhotos|navigationControl|attr|renameId|GMaps|titlebar|info|ciGMIWC_showcat|mapTypeControl|nbImages|lang|nbImgTxt|markerList|gmapsLoading|style|bind|gmapsIndex|href|position|fitBounds|requestId|lng|m1|newListIndex|viewportInitialized|LatLng|m2|lat|re|kmlFileUrl|splice|ciWARight|top|south|scaleControl|iDialogGMapWaiting|streetViewControl|applyMarkers|ciWALeft|getDiv|each||compareMarkers|left|get|displayWindowInfo|markerInList|ciGMIWC_title|imgName|getNorthEast|Point|getSouthWest|li|click|ciGMIWC_showcatList|ciGMIWC_picnum|west|POST|url|gmaps_ajax|type|ajax|src|setMap|img|php|async|close|getCenter|north|onclick|success|ajaxfct|public|blur|auto|open|createMap|setContent|unbind|iGMapsInfoWindowContent|east|gif|loading|getDefaultViewport|zoomLevel|sim|distanceTreshold|there4|sort|zoom_changed|dragend|nbPhotos|parseJSON|scrollwheel|mapTypeControlOptions|iGMapsIconContent|getMarkers|boundmap|Map|mapType|mapTypeId|zoom||||Size|MarkerImage|_|exec|Number|ffffff||mS|Array|GrumPluginClasses|markerTitle|backgroundColor|boundkml|preserveViewport|icons|KmlLayer|processing|setIcon|modal|imgCatsNames|mouseenter|autoOpen|closeText|location|while|galleries|imgTn|mouseleave|Content|load|InfoWindow|LatLngBounds|closeclick|body|sizeMode|displayPicturePrev|displayPictureNext|nbsp|dialogClass|children|resize|Marker|font|setCenter|fitToBounds|push|trigger|categoryId|40|55|size|clone|category|init|center'.split('|'),0,{}))

extensions/GMaps/js/gmapsPicture.js

@@ -31 +31 @@
                 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:

extensions/GMaps/js/gmapsPicture.packed.js

@@ -1 +1 @@
 /* file: gmapsPicture.js - v1.0.0 | packed on 2010/10/13 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}('L s={M:c,R:c};L v=[m,{w:r,h:r,x:15,y:Y},{w:r,h:r,x:15,y:Y},{w:r,h:r,x:10,y:Y},{w:1G,h:1S,x:4,y:1A},];q 1l(7){L C=g b.3.1z(2.18.1E,2.18.1C),z=g b.3.1T($("#"+7.k).16(0),{1V:7.1W,1R:7.1Q,1K:C,P:(7.P==-1)?c:l,1O:(7.P==-1)?c:l,19:(7.19==\'n\')?c:l,Q:(7.Q==-1)?c:l,1P:{1r:7.Q},17:\'\',}),1f=g b.3.1N({1M:C,z:z,B:7.17});1d=/^1L(\\d\\d)1U.*/i;j=1d.1J(7.E);9(j!=m)j=g 1X(j[1]);9(j!=m){L E=g b.3.1B(\'1I/1H/1F/\'+7.E,g b.3.1D(v[j].w,v[j].h),g b.3.1s(0,0),g b.3.1s(v[j].x,v[j].y));1f.2i(E)}9(7.1i!=\'\'){e=g b.3.2h(7.1i,{2g:l})}2e{e=m}z.e=e;7.5=z;7.t=C}$(T).2k(q(){2.6=-1;1b(i=0;i<2.3.K;i++){1l(2.3[i]);2.3[i].5.J(2.3[i].t);$(\'#\'+2.3[i].k+\' o, #\'+2.3[i].k+\' a\').f(\'V-W\',\'N.0%\');9(2.3[i].5.e!=m)2.3[i].5.e.1p(2.3[i].5);9(2.3[i].1a==\'2j\'){2.6=i;9(2.3[i].2o==\'A\'){$(\'#O\').f({S:($(T).S()*0.8)+\'1n\',U:($(T).U()*0.8)+\'1n\'})}}}9($(\'#1c\').K>0){u=$(\'#1c\').16(0).14.14.k;u=\'2d\'+u.2c().23(0,1)+u.24(1);$("#"+u+" a").22(\'1Y\',q(){9(s.R==c){1b(i=0;i<2.3.K;i++){9(2.3[i].1a==\'1Z\'){b.3.I.1x(2.3[i].5,\'1u\');2.3[i].5.J(2.3[1].t);$(\'#\'+2.3[i].k+\' o, #\'+2.3[i].k+\' a\').f(\'V-W\',\'N.0%\')}}s.R=l}})}9($(\'#1w\').K>0){$(\'#1w\').11({25:c,S:\'1t\',U:\'1t\',26:l,2b:\'X\',29:\'12\',B:2.3[2.6].B,27:q(){9(s.M==c&&2.6!=-1){b.3.I.1x(2.3[2.6].5,\'1u\');2.3[2.6].5.J(2.3[2.6].t);$(\'#O o, #O a\').f(\'V-W\',\'N.0%\');9(2.3[2.6].5.e!=m)2.3[2.6].5.e.1p(2.3[2.6].5);s.M=l}b.3.I.1v(2.3[2.6].5,\'2f\',q(){$(\'#D\').f(\'p\',\'G\');$(\'#F\').f(\'p\',\'G\')});b.3.I.1v(2.3[2.6].5,\'28\',q(){$(\'#D\').f(\'p\',\'G\');$(\'#F\').f(\'p\',\'G\')})}});$(\'H.12 H.1y-11-1q\').1k(\'<a 1o="#" k="D" 1r="p:Z;" 13="2.3[2.6].5.J(2.3[2.6].t); $(1m).f(\\\'p\\\', \\\'Z\\\').1j(); 1e(c);">\'+\'<o>&2a;</o></a>\');$(\'#D\').1g(\'B\',2.1h.20);9(2.3[2.6].5.e!=m){$(\'H.12 H.1y-11-1q\').1k(\'<a 1o="#" k="F" 13="2.3[2.6].5.2l(2.3[2.6].5.e.2n()); $(1m).f(\\\'p\\\', \\\'Z\\\').1j(); 1e(c);">\'+\'<o>&2m;</o></a>\');$(\'#F\').1g(\'B\',2.1h.21)}}});',62,149,'||gmaps|maps||gMap|currentMapLoadIndex|properties||if||google|false||kmlFile|css|new|||iM|id|true|null||span|display|function|32|viewportInitialized|gMapCenter|tabId|markerImgProp||||map||title|latlng|gmapsCenterMap|markerImg|gmapsBoundKml|inline|div|event|setCenter|length|var|icon|55|iGMapsIcon|navigationControl|mapTypeControl|meta|width|window|height|font|size||31|none||dialog|gmapsPopup|onclick|parentNode||get|markerTitle|coords|scaleControl|displayType|for|iGMapContent|re|return|marker|attr|lang|kmlFileUrl|blur|append|applyMap|this|px|href|setMap|titlebar|style|Point|auto|resize|addListener|iGMapsIconContent|trigger|ui|LatLng|39|MarkerImage|longitude|Size|latitude|img|30|GMaps|plugins|exec|center|mS|position|Marker|scrollwheel|mapTypeControlOptions|zoomLevel|zoom|40|Map|_|mapTypeId|mapType|Number|click|MP|centermap|boundkml|bind|substring|substr|autoOpen|modal|open|zoom_changed|dialogClass|bull|closeText|toUpperCase|tab|else|dragend|preserveViewport|KmlLayer|setIcon|IP|load|fitBounds|sim|getDefaultViewport|sizeMode'.split('|'),0,{}))
+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}('C s={N:b,R:b};C v=[p,{w:r,h:r,x:15,y:Y},{w:r,h:r,x:15,y:Y},{w:r,h:r,x:10,y:Y},{w:1H,h:1V,x:4,y:1B},];q 1l(6){C G=k c.3.1C(2.18.1E,2.18.1I),z=k c.3.1K($("#"+6.l).16(0),{1X:6.1S,1R:6.1M,1L:G,P:(6.P==-1)?b:g,1P:(6.P==-1)?b:g,1k:(6.1k==\'n\')?b:g,1b:(6.1b==\'n\')?b:g,O:(6.O==-1)?b:g,1Q:{1s:6.O},17:\'\',}),1f=k c.3.1O({1N:G,z:z,B:6.17});1d=/^1W(\\d\\d)1T.*/i;j=1d.1U(6.F);9(j!=p)j=k 1Y(j[1]);9(j!=p){C F=k c.3.1A(\'1J/1D/1G/\'+6.F,k c.3.1F(v[j].w,v[j].h),k c.3.1r(0,0),k c.3.1r(v[j].x,v[j].y));1f.2l(F)}9(6.1i!=\'\'){f=k c.3.2i(6.1i,{2n:g})}2o{f=p}z.f=f;6.5=z;6.t=G}$(Q).2h(q(){2.7=-1;1a(i=0;i<2.3.K;i++){1l(2.3[i]);2.3[i].5.L(2.3[i].t);$(\'#\'+2.3[i].l+\' o, #\'+2.3[i].l+\' a\').e(\'W-V\',\'M.0%\');9(2.3[i].5.f!=p)2.3[i].5.f.1p(2.3[i].5);9(2.3[i].19==\'2p\'){2.7=i;9(2.3[i].2j==\'A\'){$(\'#T\').e({S:($(Q).S()*0.8)+\'1n\',U:($(Q).U()*0.8)+\'1n\'})}}}9($(\'#1c\').K>0){u=$(\'#1c\').16(0).14.14.l;u=\'2m\'+u.2k().2f(0,1)+u.25(1);$("#"+u+" a").26(\'1Z\',q(){9(s.R==b){1a(i=0;i<2.3.K;i++){9(2.3[i].19==\'24\'){c.3.I.1t(2.3[i].5,\'1x\');2.3[i].5.L(2.3[1].t);$(\'#\'+2.3[i].l+\' o, #\'+2.3[i].l+\' a\').e(\'W-V\',\'M.0%\')}}s.R=g}})}9($(\'#1v\').K>0){$(\'#1v\').11({23:b,S:\'1u\',U:\'1u\',20:g,21:\'X\',22:\'12\',B:2.3[2.7].B,27:q(){9(s.N==b&&2.7!=-1){c.3.I.1t(2.3[2.7].5,\'1x\');2.3[2.7].5.L(2.3[2.7].t);$(\'#T o, #T a\').e(\'W-V\',\'M.0%\');9(2.3[2.7].5.f!=p)2.3[2.7].5.f.1p(2.3[2.7].5);s.N=g}c.3.I.1y(2.3[2.7].5,\'28\',q(){$(\'#E\').e(\'m\',\'D\');$(\'#J\').e(\'m\',\'D\')});c.3.I.1y(2.3[2.7].5,\'2d\',q(){$(\'#E\').e(\'m\',\'D\');$(\'#J\').e(\'m\',\'D\')})}});$(\'H.12 H.1z-11-1w\').1q(\'<a 1o="#" l="E" 1s="m:Z;" 13="2.3[2.7].5.L(2.3[2.7].t); $(1m).e(\\\'m\\\', \\\'Z\\\').1j(); 1e(b);">\'+\'<o>&2e;</o></a>\');$(\'#E\').1g(\'B\',2.1h.2c);9(2.3[2.7].5.f!=p){$(\'H.12 H.1z-11-1w\').1q(\'<a 1o="#" l="J" 13="2.3[2.7].5.2b(2.3[2.7].5.f.29()); $(1m).e(\\\'m\\\', \\\'Z\\\').1j(); 1e(b);">\'+\'<o>&2a;</o></a>\');$(\'#J\').1g(\'B\',2.1h.2g)}}});',62,150,'||gmaps|maps||gMap|properties|currentMapLoadIndex||if||false|google||css|kmlFile|true|||iM|new|id|display||span|null|function|32|viewportInitialized|gMapCenter|tabId|markerImgProp||||map||title|var|inline|gmapsCenterMap|markerImg|latlng|div|event|gmapsBoundKml|length|setCenter|55|icon|mapTypeControl|navigationControl|window|meta|width|iGMapsIcon|height|size|font||31|none||dialog|gmapsPopup|onclick|parentNode||get|markerTitle|coords|displayType|for|streetViewControl|iGMapContent|re|return|marker|attr|lang|kmlFileUrl|blur|scaleControl|applyMap|this|px|href|setMap|append|Point|style|trigger|auto|iGMapsIconContent|titlebar|resize|addListener|ui|MarkerImage|39|LatLng|GMaps|latitude|Size|img|30|longitude|plugins|Map|center|zoomLevel|position|Marker|scrollwheel|mapTypeControlOptions|zoom|mapType|_|exec|40|mS|mapTypeId|Number|click|modal|closeText|dialogClass|autoOpen|MP|substr|bind|open|dragend|getDefaultViewport|sim|fitBounds|centermap|zoom_changed|bull|substring|boundkml|load|KmlLayer|sizeMode|toUpperCase|setIcon|tab|preserveViewport|else|IP'.split('|'),0,{}))

extensions/GMaps/language/en_UK/plugin.lang.php

@@ -149 +149 @@
 $lang['gmaps_map_marker']="Aspect of marker";
 
+$lang['gmaps_googleMapStreetView']="Display the Street View control";
+
+
 ?>

extensions/GMaps/language/fr_FR/plugin.lang.php

@@ -161 +161 @@
 $lang['gmaps_map_marker']="Aspect du marqueur";
 
+$lang['gmaps_googleMapStreetViewControl']="Afficher le contrôle Street View";
+
 ?>

extensions/GMaps/maintain.inc.php

@@ -79 +79 @@
   if(GMaps_root::checkAMDActivated()=='none')
   {
-    amdMsgError($errors, 'amd');
+    gpcMsgError($errors, 'amd');
     return(false);
   }

extensions/GMaps/templates/gmaps_dialog_area_choose.tpl

@@ -133 +133 @@
           },
         scaleControl: true,
+        streetViewControl: false,
         mapTypeControl:true,
         mapTypeControlOptions: