Changeset 8586 for extensions/edit_gmaps/admin

Timestamp:

Jan 10, 2011, 4:52:27 PM (13 years ago)

Author:

cljosse

Message:

[Autosize][beta] clean up

Location:

extensions/edit_gmaps/admin

Files:

• admin_edit.php (modified) (3 diffs)
• admin_edit.tpl (modified) (2 diffs)

extensions/edit_gmaps/admin/admin_edit.php

@@ -140 +140 @@
     );
   if ( isset($image['lat']) )
-    $tpl_var['U_MAP'] = rvm_make_map_picture_url( array('image_id'=>$image['id'], 'image_file'=>$image['file']) );
+    $tpl_var['U_MAP'] = cl_make_map_picture_url( array('image_id'=>$image['id'], 'image_file'=>$image['file']) );
         $template->append('thumbnails', $tpl_var);
 }
@@ -238 +238 @@
                                                 'U_TN' => get_thumbnail_url($image),
                                                 'TITLE' => get_thumbnail_title($image),
-                                                        'U_MAP' => rvm_make_map_picture_url(
+                                                        'U_MAP' => cl_make_map_picture_url(
                                                                                             array(
                                                                                                  'image_id'=>$image['id'],
@@ -256 +256 @@
 
   //=======================================================================
-
+function cl_make_map_picture_url($params)
+{
+        global $conf;
+        /*if ( empty($conf['gmaps_api_key']) and $_SERVER['SERVER_ADDR']!='127.0.0.1' )
+                return "";*/
+        $map_url = make_picture_url($params);
+        return add_url_params($map_url, array('map'=>null) );
+}
 ?>

extensions/edit_gmaps/admin/admin_edit.tpl

@@ -12 +12 @@
   {if not empty($Selectthumbnails)  }
     <script src="http://maps.google.com/maps/api/js?sensor=false&amp;hl={$lang_info.code}" type="text/javascript"></script>
-    <script src="http://ajax.googleapis.com/ajax/libs/prototype/1.6.1.0/prototype.js" type="text/javascript"></script>
- 
- 
          <script type="text/javascript"> 
             {if isset($coordinates) && $coordinates.LAT <= 90 }
@@ -32 +29 @@
            {/if}           
          
-     Event.observe(window, 'load', onLoad );
-           
+        jQuery(window).load(function(){ldelim}
+                onLoad();
+                });
+
+    // Event.observe(window, 'load', onLoad );
+
             </script>
  {/if}