Changeset 25789 for extensions/flickr2piwigo

Timestamp:

Dec 4, 2013, 11:24:44 PM (10 years ago)

Author:

mistic100

Message:

import description and geotags

Location:

extensions/flickr2piwigo

Files:

• admin/import.php (modified) (1 diff)
• admin/template/import.list_all.tpl (modified) (2 diffs)
• admin/template/import.list_photos.tpl (modified) (3 diffs)
• admin/template/import.tpl (modified) (1 diff)
• include/ws_functions.inc.php (modified) (1 diff)
• language/en_UK/plugin.lang.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (1 diff)

extensions/flickr2piwigo/admin/import.php

@@ -300 +300 @@
 
 
-$template->assign('ACTION', $_GET['action']);
+$template->assign(array(
+  'ACTION' => $_GET['action'],
+  'GMAPS_LOADED' => !empty($pwg_loaded_plugins['rv_gmaps']) || !empty($pwg_loaded_plugins['piwigo-openstreetmap']),
+  ));
 
 $template->set_filename('flickr2piwigo', dirname(__FILE__) . '/template/import.tpl');

extensions/flickr2piwigo/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 */
@@ -127 +121 @@
       <label><input type="checkbox" name="fill_taken" checked="checked"> {'Creation date'|@translate}</label>
       <label><input type="checkbox" name="fill_posted"> {'Post date'|@translate}</label>
+      <label><input type="checkbox" name="fill_description" checked="checked"> {'Description'|@translate}</label>
+      {if $GMAPS_LOADED}<label><input type="checkbox" name="fill_geotag" checked="checked"> {'Geolocalization'|@translate}</label>{/if}
     </p>
     

extensions/flickr2piwigo/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)});
     });
   }
@@ -417 +411 @@
       <label><input type="checkbox" name="fill_taken" checked="checked"> {'Creation date'|@translate}</label>
       <label><input type="checkbox" name="fill_posted"> {'Post date'|@translate}</label>
+      <label><input type="checkbox" name="fill_description" checked="checked"> {'Description'|@translate}</label>
+      {if $GMAPS_LOADED}<label><input type="checkbox" name="fill_geotag" checked="checked"> {'Geolocalization'|@translate}</label>{/if}
     </p>
 

extensions/flickr2piwigo/admin/template/import.tpl

@@ -1 +1 @@
 {combine_css path=$FLICKR_PATH|@cat:"admin/template/style.css"}
+
+{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"}
 
 <div class="titrePage">

extensions/flickr2piwigo/include/ws_functions.inc.php

@@ -112 +112 @@
     if (in_array('fill_taken', $photo['fills']))  $updates['date_creation'] = $photo['dates']['taken'];
     if (in_array('fill_author', $photo['fills'])) $updates['author'] = pwg_db_real_escape_string($photo['owner']['username']);
+    if (in_array('fill_description', $photo['fills'])) $updates['comment'] = pwg_db_real_escape_string($photo['description']);
+    if (in_array('fill_geotag', $photo['fills']) and !empty($photo['location']) )
+    {
+      $updates['lat'] = pwg_db_real_escape_string($photo['location']['latitude']);
+      $updates['lon'] = pwg_db_real_escape_string($photo['location']['longitude']);
+    }
     
     if (count($updates))

extensions/flickr2piwigo/language/en_UK/plugin.lang.php

@@ -31 +31 @@
 $lang['Logged out'] = 'Logged out';
 $lang['%d elements ready for importation'] = '%d elements ready for importation';
+$lang['Geolocalization'] = 'Geolocalization';
 
 ?>

extensions/flickr2piwigo/language/fr_FR/plugin.lang.php

@@ -31 +31 @@
 $lang['Logged out'] = 'Déconnecté';
 $lang['%d elements ready for importation'] = '%d elements prêts à l\'importation';
+$lang['Geolocalization'] = 'Géolocalisation';
 
 ?>