Changeset 6400 for extensions/rv_gmaps/trunk

Timestamp:

May 27, 2010, 10:10:39 PM (15 years ago)

Author:

rvelices

Message:

rv_sitemap compatible with 2.1rv_gmaps compatibility with 2.1.0

Location:

extensions/rv_gmaps/trunk

Files:

• admin/admin_sync.tpl (modified) (3 diffs)
• changelog.txt (modified) (1 diff)
• main.inc.php (modified) (2 diffs)
• template/data_loader.js (modified) (2 diffs)

extensions/rv_gmaps/trunk/admin/admin_sync.tpl

@@ -2 +2 @@
 
 {if isset($metadata_result)}
-<h3>{'update_result_metadata'|@translate}</h3>
+<h3>{'Metadata synchronization results'|@translate}</h3>
 <ul>
-        <li>{$metadata_result.NB_ELEMENTS_DONE} {'update_nb_elements_metadata_sync'|@translate}</li>
-        <li>{$metadata_result.NB_ELEMENTS_CANDIDATES} {'update_nb_elements_metadata_available'|@translate}</li>
-        <li>{$metadata_result.NB_ERRORS} {'update_nb_errors'|@translate}</li>
+        <li>{$metadata_result.NB_ELEMENTS_DONE} {'elements updated in the database'|@translate}</li>
+        <li>{$metadata_result.NB_ELEMENTS_CANDIDATES} {'images candidates for metadata synchronization'|@translate}</li>
+        <li>{$metadata_result.NB_ERRORS} {'errors during synchronization'|@translate}</li>
 </ul>
 {/if}
 
 {if not empty($sync_errors)}
-<h3>{'update_error_list_title'|@translate}</h3>
+<h3>{'Error list'|@translate}</h3>
 <div class="errors">
 <ul>
@@ -26 +26 @@
     <legend>synchronization options</legend>
     <ul>
-      <li><label><input type="checkbox" name="simulate" value="1" checked="checked" {$TAG_INPUT_ENABLED} /> {'update_simulate'|@translate}</label></li>
+      <li><label><input type="checkbox" name="simulate" value="1" checked="checked" {$TAG_INPUT_ENABLED} /> {'only perform a simulation (no change in database will be made)'|@translate}</label></li>
     </ul>
   </fieldset>
 
   <fieldset id="catSubset">
-    <legend>{'update_cats_subset'|@translate}</legend>
+    <legend>{'reduce to single existing categories'|@translate}</legend>
     <ul>
     <li>
@@ -39 +39 @@
     </li>
 
-    <li><label><input type="checkbox" name="subcats_included" value="1" {$SUBCATS_INCLUDED_CHECKED} /> {'search_subcats_included'|@translate}</label></li>
+    <li><label><input type="checkbox" name="subcats_included" value="1" {$SUBCATS_INCLUDED_CHECKED} /> {'Search in subcategories'|@translate}</label></li>
     </ul>
   </fieldset>

extensions/rv_gmaps/trunk/changelog.txt

@@ +1 @@
+2.1.a
+- compatibility with piwigo 2.1
+- rolled back dirty fix in previos version (google corrected the issue)
+        
 2.0.d
   - hungarian translation thanks to external contributors

extensions/rv_gmaps/trunk/main.inc.php

@@ -1 +1 @@
 <?php /*
 Plugin Name: RV Maps&Earth
-Version: 2.0.d
+Version: 2.1.a
 Description: Extend your gallery with Google Maps and Google Earth ...
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=122
@@ -7 +7 @@
 Author URI: http://www.modusoptimus.com/
 */
-define( 'RVM_PLUGIN_VERSION', '2.0.d');
+define( 'RVM_PLUGIN_VERSION', '2.1.a');
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 

extensions/rv_gmaps/trunk/template/data_loader.js

@@ -78 +78 @@
 
         // BEGIN BUG in maps api 2.185 up to "today" 2.193 - when map wraps horizontally more than 360 deg - the getBounds is wrong
-        if ( this._map.getZoom() <= 2 || this._map.getZoom() == 3 && this._map.getSize().width > 1000 )
+        /*if ( this._map.getZoom() <= 2 || this._map.getZoom() == 3 && this._map.getSize().width > 1000 )
         {
                 bounds = new GLatLngBounds(
@@ -84 +84 @@
                                 new GLatLng( bounds.getNorthEast().lat(),  180 )
                         );
-        }
+        }*/
         // END BUG
         var latRange = bounds.toSpan().lat();