Changeset 1112


Ignore:
Timestamp:
Jul 5, 2007, 10:19:19 PM (14 years ago)
Author:
Dominic Hargreaves
Message:

Merge with 0.61

Location:
sites/oxford.openguides.org/templates
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • sites/oxford.openguides.org/templates/display_metadata.tt

    r1076 r1112  
    8888        <span class="metadata_label">Categories:</span>
    8989        [% FOREACH category = categories %]
    90           <a href="[% category.url %]" class="category">[% category.name %]</a>[%- "," UNLESS loop.last %]
     90          [% IF category.url != "" %]
     91            <a href="[% category.url %]" class="category">[% category.name %]</a>[%- "," UNLESS loop.last %]
     92          [% ELSE %]
     93            [% category.name %][%- "," UNLESS loop.last %]
     94          [% END %]
    9195        [% END %]
    9296      </li>
     
    97101        <span class="metadata_label">Locales:</span>
    98102        [% FOREACH locale = locales %]
    99           <a href="[% locale.url %]" class="addr locality">[% locale.name %]</a>[%- "," UNLESS loop.last %]
     103          [% IF locale.url != "" %]
     104            <a href="[% locale.url %]" class="addr locality">[% locale.name %]</a>[%- "," UNLESS loop.last %]
     105          [% ELSE %]
     106            [% locale.name %][%- "," UNLESS loop.last %]
     107          [% END %]
    100108        [% END %]
    101109      </li>
  • sites/oxford.openguides.org/templates/map_index.tt

    r1076 r1112  
    1212    [% metadata = node.node_data.metadata %]
    1313    [% i = i + 1 %]
    14     [% IF metadata.latitude.list.first AND metadata.longitude.list.first %]
    15       [% NEXT IF metadata.latitude.list.first.match('m') %]
    16       [% NEXT IF metadata.longitude.list.first.match('m') %]
     14    [% IF metadata.wgs84_lat.list.first AND metadata.wgs84_long.list.first %]
     15      [% NEXT IF metadata.wgs84_lat.list.first.match('m') %]
     16      [% NEXT IF metadata.wgs84_long.list.first.match('m') %]
    1717      <li><a href='#' onclick="marker[% i %].openInfoWindowHtml(htmlString[% i %]); return false;">[% node.name %]</a>[% IF metadata.city.list.first %], [% metadata.city.list.first %][% END %]</li>
    1818    [% END %]
     
    5252        [% i = i + 1 %]
    5353        [% metadata = node.node_data.metadata %]
    54         [% IF metadata.latitude.list.first AND metadata.longitude.list.first %]
    55         [% NEXT IF metadata.latitude.list.first.match('m') %]
    56         [% NEXT IF metadata.longitude.list.first.match('m') %]
     54        [% IF metadata.wgs84_lat.list.first AND metadata.wgs84_long.list.first %]
     55        [% NEXT IF metadata.wgs84_lat.list.first.match('m') %]
     56        [% NEXT IF metadata.wgs84_long.list.first.match('m') %]
    5757          var point[% i %] = new GPoint([% metadata.wgs84_long.list.first %], [% metadata.wgs84_lat.list.first %]);
    5858          var marker[% i %] = new GMarker(point[% i %],baseIcon);
  • sites/oxford.openguides.org/templates/node.tt

    r1074 r1112  
    4646[% END %]
    4747
     48<div id="node_title">
    4849[% IF current %]
    4950  [% IF backlinks_in_title AND is_indexable_node %]
     
    6667[% END %]
    6768[% IF not (content || coord_field_1_value || coord_field_2_value || latitude || longitude) %]
    68 We 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>?
     69</div>
     70<div id="nonexistent_node_message">We 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>?</div>
    6971[% ELSE %]
     72<div id="title_edit_link">
     73<a href="[% full_cgi_url %]?action=edit;id=[% node_param %]">Edit this page</a>
     74</div>
     75</div>
    7076[% INCLUDE display_metadata.tt %]
    7177
     
    124130  <small>
    125131    (Latitude:
     132    <!-- titles using the wgs84 versions here are for microformats -->
    126133    <abbr class="latitude" title="[% wgs84_lat %]">[% latitude %]</abbr>
    127134        Longitude:
Note: See TracChangeset for help on using the changeset viewer.