Changeset 6245


Ignore:
Timestamp:
05/19/10 23:26:40 (9 years ago)
Author:
rvelices
Message:

rv_gmaps compatibility with 2.1.0

Location:
extensions/rv_gmaps/trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • extensions/rv_gmaps/trunk/admin/admin_edit.php

    r3447 r6245  
    99include (PHPWG_ROOT_PATH.'admin/element_set.php'); 
    1010 
    11 $template->concat('TABSHEET_TITLE', ' '.l10n_dec('%d element', '%d elements', count($page['cat_elements_id'])).' - '.$page['title']); 
     11$template->concat('TABSHEET_TITLE', ' '.l10n_dec('%d image', '%d images', count($page['cat_elements_id'])).' - '.$page['title']); 
    1212 
    1313if ( isset($_POST['submit']) and !is_adviser() ) 
  • extensions/rv_gmaps/trunk/include/picture_map.inc.php

    r3447 r6245  
    33 
    44$template->concat('PLUGIN_PICTURE_ACTIONS', ' 
    5   <a href="'.duplicate_picture_url().'" title="'.l10n('mode_normal_hint').'"><img src="'.get_root_url().'plugins/'.$rvm_dir.'/icons/map_m.png" class="button" alt="map"></a> 
     5  <a href="'.duplicate_picture_url().'" title="'.l10n('return to normal view mode').'"><img src="'.get_root_url().'plugins/'.$rvm_dir.'/icons/map_m.png" class="button" alt="map"></a> 
    66  '); 
    77 
  • extensions/rv_gmaps/trunk/kml.php

    r3447 r6245  
    6262 
    6363if ( !empty($page['items']) ) 
    64   $dataTpl->assign( 'NB_ITEMS_DESC', sprintf( l10n('%d elements'), count($page['items']) ).'<br/>' ); 
     64  $dataTpl->assign( 'NB_ITEMS_DESC', sprintf( l10n('%d images'), count($page['items']) ).'<br/>' ); 
    6565 
    6666 
     
    112112    if ( isset($bounds['self']) ) 
    113113    { 
    114       $count_desc = l10n_dec('%d element', '%d elements', $bounds['self']['count']); 
     114      $count_desc = l10n_dec('%d image', '%d images', $bounds['self']['count']); 
    115115      if ( $bounds['self']['count'] == $bounds['count'] ) 
    116116        $count_desc .= ' '.l10n('images_available_cpl'); 
    117117      else 
    118         $count_desc .= '/'.l10n_dec('%d element', '%d elements', $bounds['count']).' '.l10n_dec('images_available_cat','images_available_cats', $bounds['nb_cats'] ); 
     118        $count_desc .= '/'.l10n_dec('%d image', '%d images', $bounds['count']).' '.l10n_dec('images_available_cat','images_available_cats', $bounds['nb_cats'] ); 
    119119    } 
    120120    else 
    121       $count_desc = l10n_dec('%d element', '%d elements', $bounds['count']) 
     121      $count_desc = l10n_dec('%d image', '%d images', $bounds['count']) 
    122122        .' '.l10n_dec('images_available_cat','images_available_cats', $bounds['nb_cats'] ); 
    123123 
  • extensions/rv_gmaps/trunk/mapl.php

    r3447 r6245  
    8888      'URL' => make_index_url( array( 'category' => $category ) ), 
    8989      'NAME' => $category['name'], 
    90       'TITLE' => l10n_dec( '%d element', '%d elements', $category['counter'] ), 
     90      'TITLE' => l10n_dec( '%d image', '%d images', $category['counter'] ), 
    9191      'CLASS' => 'tagLevel'.$category['level'] 
    9292    ) 
     
    113113        'U_MAP' => rvm_make_map_index_url( array( 'tags' => array($tag) ) ), 
    114114        'URL' => make_index_url( array( 'tags' => array($tag) ) ), 
    115         'TITLE' => l10n_dec( '%d element', '%d elements', $tag['counter'] ), 
     115        'TITLE' => l10n_dec( '%d image', '%d images', $tag['counter'] ), 
    116116      ) 
    117117    ) 
     
    137137$url = rvm_duplicate_blowup_url(array('start'=>0)); 
    138138$navbar = create_navigation_bar($url, count( $page['items'] ), $page['start'], 48); 
    139 $template->assign('NAVBAR', $navbar); 
     139$template->assign('navbar', $navbar); 
    140140 
    141141$page['items'] = array_slice( 
  • extensions/rv_gmaps/trunk/template/data_handler.js

    r3447 r6245  
    7474                        var theTitle = ""; 
    7575                        if (cluster.nb_items>1) 
    76                                 theTitle = Localization.fmt1("%d elements", cluster.nb_items); 
     76                                theTitle = Localization.fmt1("%d images", cluster.nb_items); 
    7777                        else 
    7878                                theTitle = cluster.items[0].name; 
     
    153153        } 
    154154 
    155         document.getElementById("dataLoadStatus").innerHTML = Localization.fmt1("%d elements", data.nb_items); 
     155        document.getElementById("dataLoadStatus").innerHTML = Localization.fmt1("%d images", data.nb_items); 
    156156}, 
    157157 
  • extensions/rv_gmaps/trunk/template/data_loader.js

    r5018 r6245  
    7878 
    7979        // BEGIN BUG in maps api 2.185 up to "today" 2.193 - when map wraps horizontally more than 360 deg - the getBounds is wrong 
    80         if ( this._map.getZoom() <= 2 ) 
     80        if ( this._map.getZoom() <= 2 || this._map.getZoom() == 3 && this._map.getSize().width > 1000 ) 
    8181        { 
    8282                bounds = new GLatLngBounds( 
  • extensions/rv_gmaps/trunk/template/map.tpl

    r5018 r6245  
    160160"displays %s on a map" : "{'displays %s on a map'|@translate|@escape:javascript}", 
    161161"opens %s in Google Earth" : "{'opens %s in Google Earth'|@translate|@escape:javascript}", 
    162 "%d elements" : "{'%d elements'|@translate|@escape:javascript}", 
     162"%d images" : "{'%d images'|@translate|@escape:javascript}", 
    163163{literal} 
    164164dontMindTheComma: "" 
     
    214214  </div> 
    215215  <div class="titlebar_title"> 
    216     <a href="{$U_HOME}" title="{'return to homepage'|@translate}" class="gmnoprint">{'home'|@translate}</a> 
     216    <a href="{$U_HOME}" title="{'return to homepage'|@translate}" class="gmnoprint">{'Home'|@translate}</a> 
    217217    <a href="{$U_HOME_MAP}" title="{'displays all images on a map'|@translate}"><img src="{$PLUGIN_ROOT_URL}/icons/map_sw.gif" width="32" height="17" alt="map"/></a> 
    218218    {'Viewing'|@translate}: <a id="aPageUrl" href=""></a> 
  • extensions/rv_gmaps/trunk/template/mapl.tpl

    r3447 r6245  
    1616                <ul class="categoryActions"> 
    1717                        <li><a href="{$U_KML}" title="{$KML_LINK_TITLE}" rel="nofollow" type="application/vnd.google-earth.kml+xml"><img src="{$PLUGIN_ROOT_URL}/icons/earth_m.png" class="button" alt="earth"></a></li> 
    18                         <li><a target="_top" href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li> 
     18                        <li><a target="_top" href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'Home'|@translate}"/></a></li> 
    1919                </ul> 
    2020                <h2>{$TITLE}</h2> 
     
    4646{/if} 
    4747 
    48 {if not empty($NAVBAR)}<div class="navigationBar">{$NAVBAR}</div>{/if} 
     48{if !empty($navbar) }{include file='navigation_bar.tpl'}{/if} 
    4949 
    5050{if not empty($thumbnails)} 
  • extensions/rv_gmaps/trunk/template/picture_map_content.tpl

    r4070 r6245  
    2525 
    2626<div id="mapPicture"> 
    27 <a href="{$U_NO_MAP}" title="{'mode_normal_hint'|@translate}" rel="nofollow"><img src="{$TN_SRC}" alt="thumb"/></a> 
     27<a href="{$U_NO_MAP}" title="{'return to normal view mode'|@translate}" rel="nofollow"><img src="{$TN_SRC}" alt="thumb"/></a> 
    2828<br/> 
    2929<a href="{$U_BLOWUP}" onclick="return blowupUrl(this.href);">{'More pictures near this location'|@translate}</a> 
Note: See TracChangeset for help on using the changeset viewer.