Changeset 15345


Ignore:
Timestamp:
May 27, 2012, 2:04:11 PM (8 years ago)
Author:
grum
Message:

feature:2638 - Compatibility with Piwigo 2.4

Location:
extensions/GMaps
Files:
2 added
5 deleted
15 edited

Legend:

Unmodified
Added
Removed
  • extensions/GMaps/admin/gmaps_category_maps.tpl

    r10551 r15345  
    1 {combine_script  id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"}
    2 {combine_script  id="jquery.ui.sortable" path="themes/default/js/ui/minified/jquery.ui.sortable.min.js"}
    3 {combine_script  id="jquery.ui.dialog" path="themes/default/js/ui/minified/jquery.ui.dialog.min.js"}
    4 {combine_script  id="gpc.ui.iconSelector" path="plugins/GrumPluginClasses/js/ui.iconSelector.min.js" require="jquery"}
    5 {combine_script  id="gpc.ui.categorySelector" path="plugins/GrumPluginClasses/js/ui.categorySelector.min.js" require="jquery"}
     1{combine_script id="jquery.ui" require='jquery' path="themes/default/js/ui/jquery.ui.core.js"}
     2{combine_script id="jquery.ui.widget" require='jquery.ui' path="themes/default/js/ui/jquery.ui.widget.js"}
     3{combine_script id="jquery.ui.mouse" require='jquery.ui.widget' path="themes/default/js/ui/jquery.ui.mouse.js"}
     4{combine_script id="jquery.ui.position" require='jquery.ui.widget' path="themes/default/js/ui/jquery.ui.position.js"}
     5{combine_script id="jquery.ui.sortable" require='jquery.ui.widget' path="themes/default/js/ui/jquery.ui.sortable.js"}
     6{combine_script id="jquery.ui.dialog" require='jquery.ui.widget' src="themes/default/js/ui/jquery.ui.dialog.js"}
     7{combine_script id="jquery.ui.slider" require='jquery.ui.widget' src="themes/default/js/ui/jquery.ui.slider.js"}
     8
     9{combine_script  id="gpc.ui.iconSelector" path="plugins/GrumPluginClasses/js/ui.iconSelector.js" require="jquery.ui"}
     10{combine_script  id="gpc.ui.categorySelector" path="plugins/GrumPluginClasses/js/ui.categorySelector.js" require="jquery.ui"}
    611{combine_script  id="maps.google.com/api" path="http://maps.google.com/maps/api/js?sensor=false"}
    712
  • extensions/GMaps/admin/gmaps_config.tpl

    r10551 r15345  
    1 {combine_script  id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"}
    2 {combine_script  id="jquery.ui.slider" path="themes/default/js/ui/minified/jquery.ui.slider.min.js"}
     1{combine_script id="jquery.ui" require='jquery' path="themes/default/js/ui/jquery.ui.core.js"}
     2{combine_script id="jquery.ui.widget" require='jquery.ui' path="themes/default/js/ui/jquery.ui.widget.js"}
     3{combine_script id="jquery.ui.mouse" require='jquery.ui.widget' path="themes/default/js/ui/jquery.ui.mouse.js"}
     4{combine_script id="jquery.ui.slider" require='jquery.ui.widget' src="themes/default/js/ui/jquery.ui.slider.js"}
    35
    46<h2>{'gmaps_config'|@translate}</h2>
  • extensions/GMaps/admin/gmaps_kmlfiles.tpl

    r10551 r15345  
    1 {combine_script  id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"}
    2 {combine_script  id="jquery.ui.sortable" path="themes/default/js/ui/minified/jquery.ui.sortable.min.js"}
    3 {combine_script  id="jquery.ui.dialog" path="themes/default/js/ui/minified/jquery.ui.dialog.min.js"}
     1{combine_script id="jquery.ui" require='jquery' path="themes/default/js/ui/jquery.ui.core.js"}
     2{combine_script id="jquery.ui.widget" require='jquery.ui' path="themes/default/js/ui/jquery.ui.widget.js"}
     3{combine_script id="jquery.ui.mouse" require='jquery.ui.widget' path="themes/default/js/ui/jquery.ui.mouse.js"}
     4{combine_script id="jquery.ui.position" require='jquery.ui.widget' path="themes/default/js/ui/jquery.ui.position.js"}
     5{combine_script id="jquery.ui.sortable" require='jquery.ui.widget' path="themes/default/js/ui/jquery.ui.sortable.js"}
     6{combine_script id="jquery.ui.dialog" require='jquery.ui.widget' src="themes/default/js/ui/jquery.ui.dialog.js"}
     7{combine_script id="jquery.ui.slider" require='jquery.ui.widget' src="themes/default/js/ui/jquery.ui.slider.js"}
    48
    59{literal}
  • extensions/GMaps/admin/gmaps_maps.tpl

    r10551 r15345  
    1 {combine_script  id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"}
    2 {combine_script  id="jquery.ui.dialog" path="themes/default/js/ui/minified/jquery.ui.dialog.min.js"}
    3 {combine_script  id="jquery.ui.slider" path="themes/default/js/ui/minified/jquery.ui.slider.min.js"}
     1{combine_script id="jquery.ui" require='jquery' path="themes/default/js/ui/jquery.ui.core.js"}
     2{combine_script id="jquery.ui.widget" require='jquery.ui' path="themes/default/js/ui/jquery.ui.widget.js"}
     3{combine_script id="jquery.ui.mouse" require='jquery.ui.widget' path="themes/default/js/ui/jquery.ui.mouse.js"}
     4{combine_script id="jquery.ui.position" require='jquery.ui.widget' path="themes/default/js/ui/jquery.ui.position.js"}
     5{combine_script id="jquery.ui.sortable" require='jquery.ui.widget' path="themes/default/js/ui/jquery.ui.sortable.js"}
     6{combine_script id="jquery.ui.dialog" require='jquery.ui.widget' src="themes/default/js/ui/jquery.ui.dialog.js"}
     7{combine_script id="jquery.ui.slider" require='jquery.ui.widget' src="themes/default/js/ui/jquery.ui.slider.js"}
     8
    49{combine_script  id="maps.google.com/api" path="http://maps.google.com/maps/api/js?sensor=false"}
    510
  • extensions/GMaps/gmaps_aip.class.inc.php

    r7616 r15345  
    4343      $this->tabsheet->add('amd_warning',
    4444                            l10n('gmaps_warning'),
    45                             $this->getAdminLink()."&amp;fGMaps_tabsheet=amd_warning");
     45                            $this->getAdminLink()."-amd_warning");
    4646    }
    4747    $this->tabsheet->add('maps',
    4848                          l10n('gmaps_maps'),
    49                           $this->getAdminLink()."&amp;fGMaps_tabsheet=maps");
     49                          $this->getAdminLink()."-maps");
    5050    $this->tabsheet->add('category_maps',
    5151                          l10n('gmaps_associate_category_maps'),
    52                           $this->getAdminLink()."&amp;fGMaps_tabsheet=category_maps");
     52                          $this->getAdminLink()."-category_maps");
    5353    $this->tabsheet->add('kml_files',
    5454                          l10n('gmaps_kml_files_management'),
    55                           $this->getAdminLink()."&amp;fGMaps_tabsheet=kml_files");
     55                          $this->getAdminLink()."-kml_files");
    5656    $this->tabsheet->add('search',
    5757                          l10n('gmaps_search'),
    58                           $this->getAdminLink()."&amp;fGMaps_tabsheet=search");
     58                          $this->getAdminLink()."-search");
    5959    $this->tabsheet->add('config',
    6060                          l10n('gmaps_config'),
    61                           $this->getAdminLink()."&amp;fGMaps_tabsheet=config");
     61                          $this->getAdminLink()."-config");
    6262
    6363/*    $this->tabsheet->add('help',
    6464                          l10n('gmaps_help'),
    65                           $this->getAdminLink()."&amp;fGMaps_tabsheet=help");
     65                          $this->getAdminLink()."-help");
    6666*/
    6767  }
     
    8080    parent::initEvents();
    8181
    82     if($_REQUEST['fGMaps_tabsheet']=='search')
     82    if($_GET['tab']=='search')
    8383    {
    8484      // load request builder JS only on the search page
     
    101101    $template->set_filename('plugin_admin_content', dirname(__FILE__)."/admin/gmaps_admin.tpl");
    102102
    103     switch($_REQUEST['fGMaps_tabsheet'])
     103    switch($_GET['tab'])
    104104    {
    105105      case 'amd_warning':
     
    126126    }
    127127
    128     $this->tabsheet->select($_REQUEST['fGMaps_tabsheet']);
     128    $this->tabsheet->select($_GET['tab']);
    129129    $this->tabsheet->assign();
    130130    $selected_tab=$this->tabsheet->get_selected();
     
    132132
    133133    $template_plugin["GMAPS_VERSION"] = "<i>".$this->getPluginName()."</i> ".l10n('gmaps_release').GMAPS_VERSION;
    134     $template_plugin["GMAPS_PAGE"] = $_REQUEST['fGMaps_tabsheet'];
     134    $template_plugin["GMAPS_PAGE"] = $_GET['tab'];
    135135    $template_plugin["GMAPS_TITLE"] = "";
    136136
     
    161161    if(!isset($_REQUEST['errcode'])) $_REQUEST['errcode']='';
    162162
    163     if(!isset($_REQUEST['fGMaps_tabsheet']))
     163    if(!isset($_GET['tab']))
    164164    {
    165165      if($this->amdState!='advanced' )
    166166      {
    167         $_REQUEST['fGMaps_tabsheet']="amd_warning";
     167        $_GET['tab']="amd_warning";
    168168      }
    169169      else
    170170      {
    171         $_REQUEST['fGMaps_tabsheet']="maps";
    172       }
    173     }
    174 
    175     if(!($_REQUEST['fGMaps_tabsheet']!="maps" or
    176          $_REQUEST['fGMaps_tabsheet']!="category_maps" or
    177          $_REQUEST['fGMaps_tabsheet']!="amd_warning" or
    178          $_REQUEST['fGMaps_tabsheet']!="kml_files" or
    179          $_REQUEST['fGMaps_tabsheet']!="search"
    180          //$_REQUEST['fGMaps_tabsheet']!="help"
    181          )) $_REQUEST['fGMaps_tabsheet']="maps";
    182 
    183     if($_REQUEST['fGMaps_tabsheet']=="amd_warning" and $this->amdState=='advanced') $_REQUEST['fGMaps_tabsheet']="maps";
     171        $_GET['tab']="maps";
     172      }
     173    }
     174
     175    if(!($_GET['tab']!="maps" or
     176         $_GET['tab']!="category_maps" or
     177         $_GET['tab']!="amd_warning" or
     178         $_GET['tab']!="kml_files" or
     179         $_GET['tab']!="search"
     180         //$_GET['tab']!="help"
     181         )) $_GET['tab']="maps";
     182
     183    if($_GET['tab']=="amd_warning" and $this->amdState=='advanced') $_GET['tab']="maps";
    184184  }
    185185
  • extensions/GMaps/gmaps_ajax.php

    r12214 r15345  
    2121  // in this case, PHPWG_ROOT_PATH must be declared as an absolute path...
    2222  define('PHPWG_ROOT_PATH',dirname(dirname(dirname(__FILE__))).'/');
    23 
    2423  /*
    2524   * set ajax module in admin mode if request is used for admin interface
     
    12001199                   GROUP_CONCAT(DISTINCT IF(pct.permalink IS NULL, CONCAT('*', pct.id), pct.permalink) ORDER BY pct.id SEPARATOR ';') AS imageCatsPLink,
    12011200                   pit.name AS imageName,
    1202                    pit.path, pit.tn_ext
     1201                   pit.path
    12031202            FROM (((".$this->tables['cache']." pgc
    12041203                    LEFT JOIN ".IMAGE_CATEGORY_TABLE." pic ON pic.image_id = pgc.imageId)
     
    12311230        {
    12321231          $row['imageName']  =GPCCore::getUserLanguageDesc($row['imageName']);
    1233           $row['imageTnFile']=dirname($row['path']).'/'.$conf['dir_thumbnail'].'/'.$conf['prefix_thumbnail'].get_filename_wo_extension(basename($row['path'])).'.'.$row['tn_ext'];
     1232          $row['imageTnFile']=str_replace(PHPWG_ROOT_PATH, './', DerivativeImage::thumb_url(array('id'=>$row['imageId'], 'path'=>$row['path'])));
    12341233          if(!$this->checkInGroup($row, $groups, $datas['distanceTreshold']))
    12351234          {
     
    12651264            {
    12661265              $tmpCatsNames[$key]=GPCCore::getUserLanguageDesc(substr($tmpCatsNames[$key],7));
    1267 
    1268               $tmpCatsUrl[]=make_picture_url(
    1269                 array(
    1270                   'image_id' => $point['imageId'],
    1271                   'category' => array(
    1272                     'id' => $id,
    1273                     'name' => $tmpCatsNames[$key],
    1274                     'permalink' => (substr($tmpCatsPLinks[$key],0,1)=='*')?'':$tmpCatsPLinks[$key],
     1266              $tmpCatsUrl[]=$this->replaceRoot(str_replace(PHPWG_ROOT_PATH, './',
     1267                make_picture_url(
     1268                  array(
     1269                    'image_id' => $point['imageId'],
     1270                    'category' => array(
     1271                      'id' => $id,
     1272                      'name' => $tmpCatsNames[$key],
     1273                      'permalink' => (substr($tmpCatsPLinks[$key],0,1)=='*')?'':$tmpCatsPLinks[$key],
     1274                    )
    12751275                  )
    12761276                )
    1277               );
     1277              ));
    12781278            }
    12791279
     
    12851285            $coords['lng']+=$point['longitude'];
    12861286
    1287             $coords['imgTn'][]=$this->replaceImgRoot($point['imageTnFile']);
     1287            $coords['imgTn'][]=$this->replaceRoot($point['imageTnFile']);
    12881288            $coords['imgCatsNames'][]=$tmpCatsNames;
    12891289            $coords['imgName'][]=GPCCore::getUserLanguageDesc($point['imageName']);
     
    13481348    /**
    13491349     * replace the root directroy for image
    1350      *  => './galleries/' becomes "G"
    1351      *  => './upload/' becomes "U"
     1350     *  => './_data/i/galleries/' becomes "G"
     1351     *  => './i.php?/galleries/' becomes "I"
     1352     *  => './picture.php?/' becomes "P"
    13521353     *  => other case : no chnages
    13531354     *
     
    13551356     * @returned String :
    13561357     */
    1357     private function replaceImgRoot($value)
    1358     {
    1359       if(preg_match('/^\.\/galleries\//i', $value)>0)
    1360       {
    1361         return("G".substr($value,12));
    1362       }
    1363       elseif(preg_match('/^\.\/upload\//i', $value)>0)
    1364       {
    1365         return("U".substr($value,9));
     1358    private function replaceRoot($value)
     1359    {
     1360      if(preg_match('/^\.\/_data\/i\/galleries\//i', $value)>0)
     1361      {
     1362        return("G".substr($value,20));
     1363      }
     1364      if(preg_match('/^\.\/i\.php\?\/galleries\//i', $value)>0)
     1365      {
     1366        return("I".substr($value,19));
     1367      }
     1368      if(preg_match('/^\.\/picture\.php\?\//i', $value)>0)
     1369      {
     1370        return("P".substr($value,15));
    13661371      }
    13671372      return($value);
  • extensions/GMaps/gmaps_pip.class.inc.php

    r12213 r15345  
    126126      }
    127127
    128       GPCCore::addHeaderJS("jquery", "themes/default/js/jquery.min.js");
     128
     129      GPCCore::addHeaderJS("jquery", "themes/default/js/jquery.js");
     130      GPCCore::addHeaderJS("jquery.ui", "themes/default/js/ui/jquery.ui.core.js", array('jquery'));
     131      GPCCore::addHeaderJS("jquery.ui.widget", "themes/default/js/ui/jquery.ui.widget.js", array('jquery.ui'));
     132
    129133      GPCCore::addHeaderJS("maps.google.com/api", "http://maps.google.com/maps/api/js?sensor=false");
    130       GPCCore::addHeaderJS("gmaps.markup", "plugins/GMaps/js/gmapsMarkup".GPCCore::getMinified().".js", array('jquery'));
     134      GPCCore::addHeaderJS('gmaps.infoWindow', GMAPS_PATH.'js/gmapsInfoWindow.js', array('jquery'));
     135      GPCCore::addHeaderJS("gmaps.markup", "plugins/GMaps/js/gmapsMarkup.js", array('jquery'));
    131136
    132137      $desc = preg_replace(
     
    201206        "<script type=\"text/javascript\">
    202207        var gmapsMarkup =
    203           {
    204             categoryId:".$page['category']['id'].",
    205             maps:
    206             [".implode(',', $scripts)."]
    207           };
     208              {
     209                categoryId:".$page['category']['id'].",
     210                maps:
     211                [".implode(',', $scripts)."]
     212              },
     213            gmaps =
     214              {
     215                lang:{
     216                  boundmap:'".l10n('gmaps_i_boundmap')."',
     217                  boundkml:'".l10n('gmaps_i_boundkml')."',
     218                  loading:'".l10n('gmaps_loading')."',
     219                  gmaps_i_show_this_picture_in:'".l10n('gmaps_i_show_this_picture_in')."'
     220                }
     221              };
    208222        </script>", false);
    209223    }
     
    315329</script>", false);
    316330
    317           GPCCore::addHeaderJS('gmaps.infoWindow', GMAPS_PATH.'js/gmapsInfoWindow'.GPCCore::getMinified().'.js', array('jquery'));
    318           GPCCore::addHeaderJS('gmaps.category', GMAPS_PATH.'js/gmapsCategory'.GPCCore::getMinified().'.js', array('jquery', 'gmaps.infoWindow'));
     331          GPCCore::addHeaderJS('gmaps.infoWindow', GMAPS_PATH.'js/gmapsInfoWindow.js', array('jquery'));
     332          GPCCore::addHeaderJS('gmaps.category', GMAPS_PATH.'js/gmapsCategory.js', array('jquery', 'gmaps.infoWindow'));
    319333        }
    320334      }
  • extensions/GMaps/gmaps_version.inc.php

    r12204 r15345  
    1515  if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
    1616
    17   define('GMAPS_VERSION',  '1.3.2');
    18   define('GMAPS_VERSION2', '01.03.02');
    19   define('GMAPS_GPC_NEEDED', '3.5.1');
    20   define('GMAPS_AMD_NEEDED', '0.6.0'); //advanced metadata plugin is needed
     17  define('GMAPS_VERSION',  '1.4.0');
     18  define('GMAPS_VERSION2', '01.04.00');
     19  define('GMAPS_GPC_NEEDED', '3.5.2');
     20  define('GMAPS_AMD_NEEDED', '0.7.0'); //advanced metadata plugin is needed
    2121?>
  • extensions/GMaps/js/gmapsCategory.js

    r12204 r15345  
    208208      for(var index=0;index<marker.info.imgTn.length;index++)
    209209      {
    210         switch(marker.info.imgTn[index].charAt(0))
    211         {
    212           case 'G':
    213             marker.info.imgTn[index]='./galleries/'+marker.info.imgTn[index].substr(1);
    214             break;
    215           case 'U':
    216             marker.info.imgTn[index]='./upload/'+marker.info.imgTn[index].substr(1);
    217             break;
    218         }
    219       }
    220     }
     210        marker.info.imgTn[index]=replaceRoot(marker.info.imgTn[index]);
     211      }
     212    }
     213  }
     214
     215  var replaceRoot=function(value)
     216  {
     217    var returned=value;
     218    switch(value.charAt(0))
     219    {
     220      case 'G':
     221        returned='./_data/i/galleries/'+value.substr(1);
     222        break;
     223      case 'I':
     224        returned='./i.php?/galleries/'+value.substr(1);
     225        break;
     226      case 'P':
     227        returned='./picture.php?/'+value.substr(1);
     228        break;
     229    }
     230    return(returned);
    221231  }
    222232
     
    335345        function ()
    336346        {
    337           window.location=gmaps.currentInfo.imgCatsUrl[gmaps.currentInfo.displayed][0];
     347          window.location=replaceRoot(gmaps.currentInfo.imgCatsUrl[gmaps.currentInfo.displayed][0]);
    338348        }
    339349      );
     
    345355      {
    346356        $('#ciGMIWC_showcatList')
    347           .append('<li><a href="'+gmaps.currentInfo.imgCatsUrl[index][i]+'">'+gmaps.currentInfo.imgCatsNames[index][i]+'</a></li>');
     357          .append('<li><a href="'+replaceRoot(gmaps.currentInfo.imgCatsUrl[index][i])+'">'+gmaps.currentInfo.imgCatsNames[index][i]+'</a></li>');
    348358      }
    349359      $('#ciGMIWC_img, #ciGMIWC_showcat')
  • extensions/GMaps/js/gmapsMarkup.js

    r12204 r15345  
    237237      for(var index=0;index<marker.info.imgTn.length;index++)
    238238      {
    239         switch(marker.info.imgTn[index].charAt(0))
    240         {
    241           case 'G':
    242             marker.info.imgTn[index]='./galleries/'+marker.info.imgTn[index].substr(1);
    243             break;
    244           case 'U':
    245             marker.info.imgTn[index]='./upload/'+marker.info.imgTn[index].substr(1);
    246             break;
    247         }
    248       }
    249     }
    250   };
     239        marker.info.imgTn[index]=replaceRoot(marker.info.imgTn[index]);
     240      }
     241    }
     242  };
     243
     244  var replaceRoot=function(value)
     245  {
     246    var returned=value;
     247    switch(value.charAt(0))
     248    {
     249      case 'G':
     250        returned='./_data/i/galleries/'+value.substr(1);
     251        break;
     252      case 'I':
     253        returned='./i.php?/galleries/'+value.substr(1);
     254        break;
     255      case 'P':
     256        returned='./picture.php?/'+value.substr(1);
     257        break;
     258    }
     259    return(returned);
     260  }
    251261
    252262  var compareMarkers=function(m1,m2)
     
    343353        function ()
    344354        {
    345           window.location=gmapsMarkup.currentInfo.imgCatsUrl[gmapsMarkup.currentInfo.displayed][0];
     355          window.location=replaceRoot(gmapsMarkup.currentInfo.imgCatsUrl[gmapsMarkup.currentInfo.displayed][0]);
    346356        }
    347357      );
     
    353363      {
    354364        $('#ciGMIWC_showcatList')
    355           .append('<li><a href="'+gmapsMarkup.currentInfo.imgCatsUrl[index][i]+'">'+gmapsMarkup.currentInfo.imgCatsNames[index][i]+'</a></li>');
     365          .append('<li><a href="'+replaceRoot(gmapsMarkup.currentInfo.imgCatsUrl[index][i])+'">'+gmapsMarkup.currentInfo.imgCatsNames[index][i]+'</a></li>');
    356366      }
    357367      $('#ciGMIWC_img, #ciGMIWC_showcat')
     
    462472  function ()
    463473  {
     474    initInfoWindow();
     475
    464476    gmapsMM=new markupMaps();
    465477
  • extensions/GMaps/main.inc.php

    r12214 r15345  
    22/*
    33Plugin Name: GMaps
    4 Version: 1.3.2
     4Version: 1.4.0
    55Description: Display and manage (google) maps
    66Plugin URI: http://piwigo.org/ext/extension_view.php?eid=454
     
    123123|         |            |   . Manage extended description for categories names
    124124|         |            |
     125| 1.4.0   | 2012-05-25 | * mantis feature:2638
     126|         |            |   . Compatibility with Piwigo 2.4
     127|         |            |
    125128|         |            |
    126129|         |            |
  • extensions/GMaps/templates/gmaps_category.tpl

    r12204 r15345  
    1 {combine_script id="jquery" path="themes/default/js/jquery.min.js"}
    2 {combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"}
    3 {combine_script id="jquery.ui.dialog" path="themes/default/js/ui/minified/jquery.ui.dialog.min.js"}
     1{combine_script id="jquery.ui" require='jquery' path="themes/default/js/ui/jquery.ui.core.js"}
     2{combine_script id="jquery.ui.widget" require='jquery.ui' path="themes/default/js/ui/jquery.ui.widget.js"}
     3{combine_script id="jquery.ui.mouse" require='jquery.ui.widget' path="themes/default/js/ui/jquery.ui.mouse.js"}
     4{combine_script id="jquery.ui.position" require='jquery.ui.widget' path="themes/default/js/ui/jquery.ui.position.js"}
     5{combine_script id="jquery.ui.dialog" require='jquery.ui.widget' src="themes/default/js/ui/jquery.ui.dialog.js"}
     6
    47{combine_script id="maps.google.com/api" path="http://maps.google.com/maps/api/js?sensor=false"}
    58
  • extensions/GMaps/templates/gmaps_dialog_area_choose.tpl

    r10551 r15345  
    1 {combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"}
    2 {combine_script id="jquery.ui.dialog" path="themes/default/js/ui/minified/jquery.ui.dialog.min.js"}
     1{combine_script id="jquery.ui" require='jquery' path="themes/default/js/ui/jquery.ui.core.js"}
     2{combine_script id="jquery.ui.widget" require='jquery.ui' path="themes/default/js/ui/jquery.ui.widget.js"}
     3{combine_script id="jquery.ui.mouse" require='jquery.ui.widget' path="themes/default/js/ui/jquery.ui.mouse.js"}
     4{combine_script id="jquery.ui.position" require='jquery.ui.widget' path="themes/default/js/ui/jquery.ui.position.js"}
     5{combine_script id="jquery.ui.dialog" require='jquery.ui.widget' src="themes/default/js/ui/jquery.ui.dialog.js"}
     6
    37{combine_script id="maps.google.com/api" path="http://maps.google.com/maps/api/js?sensor=false"}
    48
  • extensions/GMaps/templates/gmaps_picture_icon.tpl

    r10551 r15345  
    1 {combine_script id="jquery" path="themes/default/js/jquery.min.js"}
    2 {combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"}
    3 {combine_script id="jquery.ui.dialog" path="themes/default/js/ui/minified/jquery.ui.dialog.min.js"}
     1{combine_script id="jquery.ui" require='jquery' path="themes/default/js/ui/jquery.ui.core.js"}
     2{combine_script id="jquery.ui.widget" require='jquery.ui' path="themes/default/js/ui/jquery.ui.widget.js"}
     3{combine_script id="jquery.ui.mouse" require='jquery.ui.widget' path="themes/default/js/ui/jquery.ui.mouse.js"}
     4{combine_script id="jquery.ui.position" require='jquery.ui.widget' path="themes/default/js/ui/jquery.ui.position.js"}
     5{combine_script id="jquery.ui.dialog" require='jquery.ui.widget' src="themes/default/js/ui/jquery.ui.dialog.js"}
     6
    47{combine_script id="maps.google.com/api" path="http://maps.google.com/maps/api/js?sensor=false"}
    5 {combine_script id="gmaps.picture" path="plugins/GMaps/js/gmapsPicture.min.js" require="jquery.ui"}
     8{combine_script id="gmaps.picture" path="plugins/GMaps/js/gmapsPicture.js" require="jquery.ui"}
    69
    710<div id='iGMapsIconContent' style='display:none;'>
  • extensions/GMaps/templates/gmaps_picture_meta.tpl

    r10551 r15345  
    1 {combine_script id="jquery" path="themes/default/js/jquery.min.js"}
     1{combine_script id="jquery" path="themes/default/js/jquery.js"}
    22{combine_script id="maps.google.com/api" path="http://maps.google.com/maps/api/js?sensor=false"}
    3 {combine_script id="gmaps.picture" path="plugins/GMaps/js/gmapsPicture.min.js" require="jquery"}
     3{combine_script id="gmaps.picture" path="plugins/GMaps/js/gmapsPicture.js" require="jquery"}
    44
    55<div id='iGMapContent' style='text-align:center;'>
Note: See TracChangeset for help on using the changeset viewer.