Changeset 1051


Ignore:
Timestamp:
Jun 9, 2007, 10:33:04 PM (14 years ago)
Author:
kake
Message:

Finish changing from use of "latitude" and "longitude" template variables to "wgs84_lat" and "wgs84_long" (the first lot of this was accidentally committed in [1049], sorry). Fixes #176.

Location:
trunk/templates
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/templates/navbar_tools.tt

    r1008 r1051  
    66    <li><a href="[% full_cgi_url %]?action=random">Random Page</a></li>
    77    <li><a href="[% full_cgi_url %]?action=show_wanted_pages">Wanted Pages</a></li>
    8     [% IF geocache_link AND latitude AND longitude %]
    9       <li><a href="http://www.geocaching.com/seek/nearest_cache.asp?origin_lat=[% latitude %];origin_long=[% longitude %]">Look for nearby geocaches</a></li>
     8    [% IF geocache_link AND wgs84_lat AND wgs84_long %]
     9      <li><a href="http://www.geocaching.com/seek/nearest_cache.asp?origin_lat=[% wgs84_lat %];origin_long=[% wgs84_long %]">Look for nearby geocaches</a></li>
    1010    [% END %]
    1111  </ul>
  • trunk/templates/node.tt

    r1036 r1051  
    4848  </h2>
    4949[% END %]
    50 [% IF not (content || coord_field_1_value || coord_field_2_value || latitude || longitude) %]
     50[% IF not (content || coord_field_1_value || coord_field_2_value || wgs84_lat || wgs84_long) %]
    5151</div>
    5252We don't have a node called "[% node_param %]". Would you like to <a href="[% full_cgi_url %]?action=edit;id=[% node_param %]">create it</a>?
     
    8787  </div>
    8888[% END %]
    89 [% IF (latitude AND longitude) OR (os_x AND os_y) OR (osie_x AND osie_y) %]
     89[% IF (wgs84_lat AND wgs84_long) OR (os_x AND os_y) OR (osie_x AND osie_y) %]
    9090<div id="coordinates" class="geo">
    9191[% END %]
     
    109109  &nbsp;&nbsp;&nbsp;
    110110[% END %]
    111 [% IF latitude AND longitude %]
     111[% IF wgs84_lat AND wgs84_long %]
    112112  <small>
    113113    (Latitude:
    114     <abbr class="latitude" title="[% wgs84_lat %]">[% latitude %]</abbr>
     114    <abbr class="latitude" title="[% wgs84_lat %]">[% wgs84_lat %]</abbr>
    115115        Longitude:
    116         <abbr class="longitude" title="[% wgs84_long %]">[% longitude %]</abbr>)
     116        <abbr class="longitude" title="[% wgs84_long %]">[% wgs84_long %]</abbr>)
    117117  </small>
    118118[% END %]
    119 [% IF (latitude AND longitude) OR (os_x AND os_y) OR (osie_x AND osie_y)%]
     119[% IF (wgs84_lat AND wgs84_long) OR (os_x AND os_y) OR (osie_x AND osie_y)%]
    120120</div>
    121121[% END %]
  • trunk/templates/node_rdf.tt

    r1016 r1051  
    6868      [% END %]
    6969
    70       [% IF latitude AND longitude %]
    71         <geo:lat>[% latitude %]</geo:lat>
    72         <geo:long>[% longitude %]</geo:long>
     70      [% IF wgs84_lat AND wgs84_long %]
     71        <geo:lat>[% wgs84_lat %]</geo:lat>
     72        <geo:long>[% wgs84_long %]</geo:long>
    7373      [% END %]
    7474
  • trunk/templates/rdf_index.tt

    r693 r1051  
    2525[% metadata = node.node_data.metadata %]
    2626
    27   [%- IF metadata.os_x.list.first || metadata.os_y.list.first || metadata.latitude.list.first || metadata.longitude.list.first ||
     27  [%- IF metadata.os_x.list.first || metadata.os_y.list.first || metadata.wgs84_lat.list.first || metadata.wgs84_long.list.first ||
    2828        metadata.locale.list.first || metadata.address.list.first || metadata.postcode.list.first || metadata.map_link.list.first -%]
    2929    [% nodeType = 'geo:SpatialThing' %]
     
    3636      <rdfs:seeAlso rdf:resource="[% full_cgi_url %]?id=[% node.param %];format=rdf" />
    3737      <dc:title>[% node.name %]</dc:title>
    38       [% IF metadata.latitude.list.first AND metadata.longitude.list.first %]
    39       <geo:lat>[% metadata.latitude.list.first %]</geo:lat>
    40       <geo:long>[% metadata.longitude.list.first %]</geo:long>
     38      [% IF metadata.wgs84_lat.list.first AND metadata.wgs84_long.list.first %]
     39      <geo:lat>[% metadata.wgs84_lat.list.first %]</geo:lat>
     40      <geo:long>[% metadata.wgs84_long.list.first %]</geo:long>
    4141      [% END %]
    4242      <link>[% full_cgi_url %]?[% node.param %]</link>
Note: See TracChangeset for help on using the changeset viewer.