Ignore:
Timestamp:
12/04/13 23:23:58 (6 years ago)
Author:
mistic100
Message:

allow import of geotags if OSM is installed

Location:
extensions/Google2Piwigo/admin
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • extensions/Google2Piwigo/admin/import.php

    r24816 r25788  
    294294$template->assign(array( 
    295295  'ACTION' => $_GET['action'], 
    296   'GMAPS_LOADED' => !empty($pwg_loaded_plugins['rv_gmaps']), 
     296  'GMAPS_LOADED' => !empty($pwg_loaded_plugins['rv_gmaps']) || !empty($pwg_loaded_plugins['piwigo-openstreetmap']), 
    297297  )); 
    298298 
  • extensions/Google2Piwigo/admin/template/import.list_all.tpl

    r20670 r25788  
    1 {include file='include/colorbox.inc.tpl'} 
    2 {include file='include/add_album.inc.tpl'} 
    3 {combine_script id='jquery.ajaxmanager' load='footer' path='themes/default/js/plugins/jquery.ajaxmanager.js'} 
    4 {combine_script id='jquery.jgrowl' load='footer' require='jquery' path='themes/default/js/plugins/jquery.jgrowl_minimized.js'} 
    5 {combine_css path="admin/themes/default/uploadify.jGrowl.css"} 
    6  
    71{footer_script require='jquery.ajaxmanager,jquery.jgrowl'} 
    82/* global vars */ 
  • extensions/Google2Piwigo/admin/template/import.list_photos.tpl

    r20670 r25788  
    1 {include file='include/colorbox.inc.tpl'} 
    2 {include file='include/add_album.inc.tpl'} 
    3 {combine_script id='jquery.ajaxmanager' load='footer' path='themes/default/js/plugins/jquery.ajaxmanager.js'} 
    4 {combine_script id='jquery.jgrowl' load='footer' require='jquery' path='themes/default/js/plugins/jquery.jgrowl_minimized.js'} 
    5 {combine_css path="admin/themes/default/uploadify.jGrowl.css"} 
    6  
    71{footer_script require='jquery.ajaxmanager,jquery.jgrowl'} 
    82/* global vars */ 
     
    6660        return true; 
    6761      }); 
    68       $(this).click(function(event) {console.log(event.shiftKey);$(this).triggerHandler("shclick",event)}); 
     62      $(this).click(function(event) {$(this).triggerHandler("shclick",event)}); 
    6963    }); 
    7064  } 
  • extensions/Google2Piwigo/admin/template/import.tpl

    r20670 r25788  
     1{include file='include/colorbox.inc.tpl'} 
     2{include file='include/add_album.inc.tpl'} 
     3{combine_script id='jquery.ajaxmanager' load='footer' path='themes/default/js/plugins/jquery.ajaxmanager.js'} 
     4{combine_script id='jquery.jgrowl' load='footer' require='jquery' path='themes/default/js/plugins/jquery.jgrowl_minimized.js'} 
     5{combine_css path="themes/default/js/plugins/jquery.jGrowl.css"} 
     6 
    17{combine_css path=$PICASA_WA_PATH|@cat:"admin/template/style.css"} 
    28 
Note: See TracChangeset for help on using the changeset viewer.