Changeset 25788

Timestamp:

Dec 4, 2013, 11:23:58 PM (10 years ago)

Author:

mistic100

Message:

allow import of geotags if OSM is installed

Location:

extensions/Google2Piwigo/admin

Files:

• import.php (modified) (1 diff)
• template/import.list_all.tpl (modified) (1 diff)
• template/import.list_photos.tpl (modified) (2 diffs)
• template/import.tpl (modified) (1 diff)

extensions/Google2Piwigo/admin/import.php

@@ -294 +294 @@
 $template->assign(array(
   'ACTION' => $_GET['action'],
-  'GMAPS_LOADED' => !empty($pwg_loaded_plugins['rv_gmaps']),
+  'GMAPS_LOADED' => !empty($pwg_loaded_plugins['rv_gmaps']) || !empty($pwg_loaded_plugins['piwigo-openstreetmap']),
   ));
 

extensions/Google2Piwigo/admin/template/import.list_all.tpl

@@ -1 @@
-{include file='include/colorbox.inc.tpl'}
-{include file='include/add_album.inc.tpl'}
-{combine_script id='jquery.ajaxmanager' load='footer' path='themes/default/js/plugins/jquery.ajaxmanager.js'}
-{combine_script id='jquery.jgrowl' load='footer' require='jquery' path='themes/default/js/plugins/jquery.jgrowl_minimized.js'}
-{combine_css path="admin/themes/default/uploadify.jGrowl.css"}
-
 {footer_script require='jquery.ajaxmanager,jquery.jgrowl'}
 /* global vars */

extensions/Google2Piwigo/admin/template/import.list_photos.tpl

@@ -1 @@
-{include file='include/colorbox.inc.tpl'}
-{include file='include/add_album.inc.tpl'}
-{combine_script id='jquery.ajaxmanager' load='footer' path='themes/default/js/plugins/jquery.ajaxmanager.js'}
-{combine_script id='jquery.jgrowl' load='footer' require='jquery' path='themes/default/js/plugins/jquery.jgrowl_minimized.js'}
-{combine_css path="admin/themes/default/uploadify.jGrowl.css"}
-
 {footer_script require='jquery.ajaxmanager,jquery.jgrowl'}
 /* global vars */
@@ -66 +60 @@
         return true;
       });
-      $(this).click(function(event) {console.log(event.shiftKey);$(this).triggerHandler("shclick",event)});
+      $(this).click(function(event) {$(this).triggerHandler("shclick",event)});
     });
   }

extensions/Google2Piwigo/admin/template/import.tpl

@@ +1 @@
+{include file='include/colorbox.inc.tpl'}
+{include file='include/add_album.inc.tpl'}
+{combine_script id='jquery.ajaxmanager' load='footer' path='themes/default/js/plugins/jquery.ajaxmanager.js'}
+{combine_script id='jquery.jgrowl' load='footer' require='jquery' path='themes/default/js/plugins/jquery.jgrowl_minimized.js'}
+{combine_css path="themes/default/js/plugins/jquery.jGrowl.css"}
+
 {combine_css path=$PICASA_WA_PATH|@cat:"admin/template/style.css"}