Changeset 639


Ignore:
Timestamp:
Jun 2, 2005, 11:09:18 PM (17 years ago)
Author:
Earle Martin
Message:

bring address display into line with London templates; show city after address

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib/OpenGuides/Template.pm

    r638 r639  
    114114    my $script_name = $config->script_name;
    115115    my $script_url  = $config->script_url;
    116 
     116    my $default_city = $config->default_city;
     117   
    117118    # Check cookie to see if we need to set the formatting_rules_link.
    118119    my ($formatting_rules_link, $omit_help_links);
     
    151152                    enable_page_deletion  => $enable_page_deletion,
    152153                    language              => $config->default_language,
     154                    default_city          => $default_city,
    153155    };
    154156
  • trunk/templates/display_metadata.tt

    r638 r639  
    99    [% IF phone %]
    1010      <li class="telephone">
    11         <label>Telephone:</label> [% CGI.escapeHTML(phone) %]
     11        <span class="metadata_label">Telephone:</span> [% CGI.escapeHTML(phone) %]
    1212      </li>
    1313    [% END %]
    1414    [% IF fax %]
    1515      <li class="fax">
    16         <label>Fax:</label> [% CGI.escapeHTML(fax) %]
     16        <span class="metadata_label">Fax:</span> [% CGI.escapeHTML(fax) %]
    1717      </li>
    1818    [% END %]
    1919    [% IF address %]
    2020      <li class="address">
    21         <label>Address:</label>
     21        <span class="metadata_label">Address:</span>
     22        [% CGI.escapeHTML(address) %], [% default_city %]
    2223        [% IF map_link %]
    23           [<a href="[% map_link %]">[% CGI.escapeHTML(address) %]</a>]
    24         [% ELSE %]
    25           [% CGI.escapeHTML(address) %]
     24          <a href="[% map_link %]">(map of this place)</a>
    2625        [% END %]
    2726      </li>
    2827    [% ELSIF map_link %]
    2928      <li class="map">
    30         <label>Map:</label>
    31           [<a href="[% map_link %]">[% CGI.escapeHTML(map_link) %]</a>]
     29        <span class="metadata_label"><a href="[% map_link %]">Map of this place</a></span>
    3230      </li>
    3331    [% END %]
    3432    [% IF postcode %]
    3533      <li class="postcode">
    36         <label>Postcode:</label>
     34        <span class="metadata_label">Postcode:</span>
    3735        [% CGI.escapeHTML(postcode) %]
    3836      </li>
     
    4038    [% IF formatted_website_text %]
    4139      <li class="website_link">
    42         <label>Website:</label> [% formatted_website_text %]
     40        <span class="metadata_label">Website:</span> [% formatted_website_text %]
    4341      </li>
    4442    [% END %]
    4543    [% IF hours_text %]
    4644      <li class="opening_hours">
    47         <label>Opening Hours:</label>
     45        <span class="metadata_label">Opening Hours:</span>
    4846        [% CGI.escapeHTML(hours_text) %]
    4947      </li>
     
    5755    [% IF categories.size AND categories.size > 0 %]
    5856      <li class="categories_list">
    59         <label>Categories:</label>
     57        <span class="metadata_label">Categories:</span>
    6058        [% FOREACH category = categories %]
    6159          <a href="[% category.url %]">[% category.name %]</a>
     
    6765    [% IF locales.size AND locales.size > 0 %]
    6866      <li class="locales_list">
    69         <label>Locale:</label>
     67        <span class="metadata_label">Locale:</span>
    7068        [% FOREACH locale = locales %]
    7169          <a href="[% locale.url %]">[% locale.name %]</a>
Note: See TracChangeset for help on using the changeset viewer.