Ignore:
Timestamp:
09/28/12 08:08:47 (12 years ago)
Author:
nanardon
Message:

fix conflict

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/LATMOS-Accounts-Web/root/html/users/address_form.tt

    r971 r1162  
    11<!-- $Id$ --> 
    22<table border="1"> 
     3 
     4<tr><th colspan=2> 
     5[% IF  address.get_c_field('unexported') %] 
     6<img src="[% c.uri_for('/static', 'images', 'mail-mark-junk.png') %]"> 
     7[% ELSE %] 
     8<img src="[% c.uri_for('/static', 'images', 'mail-mark-unread.png') %]"> 
     9[% END %] 
     10 
     11[% IF  address.get_c_field('isMainAddress') %] 
     12 
     13        <img src="[% c.uri_for('/static', 'images', 'gtk-home.png') %]" 
     14            title="Adresse principale" alt="Adresse principale" 
     15        > 
     16[% END %] 
     17[% address.get_c_field('l') | html %] 
     18[% IF address.get_c_field('physicalDeliveryOfficeName') %] 
     19- [% address.get_c_field('physicalDeliveryOfficeName') | html %] 
     20[% END %] 
     21</th></tr> 
    322 
    423[% FOREACH attrs IN [ 'site', 'description', 'isMainAddress', 
Note: See TracChangeset for help on using the changeset viewer.