Changeset 25789


Ignore:
Timestamp:
Dec 4, 2013, 11:24:44 PM (7 years ago)
Author:
mistic100
Message:

import description and geotags

Location:
extensions/flickr2piwigo
Files:
7 edited

Legend:

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

    r24815 r25789  
    300300
    301301
    302 $template->assign('ACTION', $_GET['action']);
     302$template->assign(array(
     303  'ACTION' => $_GET['action'],
     304  'GMAPS_LOADED' => !empty($pwg_loaded_plugins['rv_gmaps']) || !empty($pwg_loaded_plugins['piwigo-openstreetmap']),
     305  ));
    303306
    304307$template->set_filename('flickr2piwigo', dirname(__FILE__) . '/template/import.tpl');
  • extensions/flickr2piwigo/admin/template/import.list_all.tpl

    r17476 r25789  
    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 */
     
    127121      <label><input type="checkbox" name="fill_taken" checked="checked"> {'Creation date'|@translate}</label>
    128122      <label><input type="checkbox" name="fill_posted"> {'Post date'|@translate}</label>
     123      <label><input type="checkbox" name="fill_description" checked="checked"> {'Description'|@translate}</label>
     124      {if $GMAPS_LOADED}<label><input type="checkbox" name="fill_geotag" checked="checked"> {'Geolocalization'|@translate}</label>{/if}
    129125    </p>
    130126   
  • extensions/flickr2piwigo/admin/template/import.list_photos.tpl

    r17476 r25789  
    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  }
     
    417411      <label><input type="checkbox" name="fill_taken" checked="checked"> {'Creation date'|@translate}</label>
    418412      <label><input type="checkbox" name="fill_posted"> {'Post date'|@translate}</label>
     413      <label><input type="checkbox" name="fill_description" checked="checked"> {'Description'|@translate}</label>
     414      {if $GMAPS_LOADED}<label><input type="checkbox" name="fill_geotag" checked="checked"> {'Geolocalization'|@translate}</label>{/if}
    419415    </p>
    420416
  • extensions/flickr2piwigo/admin/template/import.tpl

    r18911 r25789  
    11{combine_css path=$FLICKR_PATH|@cat:"admin/template/style.css"}
     2
     3{include file='include/colorbox.inc.tpl'}
     4{include file='include/add_album.inc.tpl'}
     5{combine_script id='jquery.ajaxmanager' load='footer' path='themes/default/js/plugins/jquery.ajaxmanager.js'}
     6{combine_script id='jquery.jgrowl' load='footer' require='jquery' path='themes/default/js/plugins/jquery.jgrowl_minimized.js'}
     7{combine_css path="themes/default/js/plugins/jquery.jGrowl.css"}
    28
    39<div class="titrePage">
  • extensions/flickr2piwigo/include/ws_functions.inc.php

    r24815 r25789  
    112112    if (in_array('fill_taken', $photo['fills']))  $updates['date_creation'] = $photo['dates']['taken'];
    113113    if (in_array('fill_author', $photo['fills'])) $updates['author'] = pwg_db_real_escape_string($photo['owner']['username']);
     114    if (in_array('fill_description', $photo['fills'])) $updates['comment'] = pwg_db_real_escape_string($photo['description']);
     115    if (in_array('fill_geotag', $photo['fills']) and !empty($photo['location']) )
     116    {
     117      $updates['lat'] = pwg_db_real_escape_string($photo['location']['latitude']);
     118      $updates['lon'] = pwg_db_real_escape_string($photo['location']['longitude']);
     119    }
    114120   
    115121    if (count($updates))
  • extensions/flickr2piwigo/language/en_UK/plugin.lang.php

    r18911 r25789  
    3131$lang['Logged out'] = 'Logged out';
    3232$lang['%d elements ready for importation'] = '%d elements ready for importation';
     33$lang['Geolocalization'] = 'Geolocalization';
    3334
    3435?>
  • extensions/flickr2piwigo/language/fr_FR/plugin.lang.php

    r18911 r25789  
    3131$lang['Logged out'] = 'Déconnecté';
    3232$lang['%d elements ready for importation'] = '%d elements prêts à l\'importation';
     33$lang['Geolocalization'] = 'Géolocalisation';
    3334
    3435?>
Note: See TracChangeset for help on using the changeset viewer.