Changeset 1162 for trunk/LATMOS-Accounts-Web/root/html/includes/defs.tt

Timestamp:

09/28/12 08:08:47 (12 years ago)

Author:

nanardon

Message:

fix conflict

File:

• trunk/LATMOS-Accounts-Web/root/html/includes/defs.tt (modified) (1 diff)

trunk/LATMOS-Accounts-Web/root/html/includes/defs.tt

@@ -13 +13 @@
 [% IF object.type == 'user' %]
     [% IF object.get_attributes('unexported') %]
-<img src="[% c.uri_for('/static', 'icons', 'gtk-delete.png') %]"
+<img src="[% c.uri_for('/static', 'images', 'gtk-delete.png') %]"
 class="notice" title="Ce compte est désactivé" alt="disable">
     [% ELSIF object.get_attributes('expired') %]
-<img src="[% c.uri_for('/static', 'icons', 'emblem-urgent.png') %]"
+<img src="[% c.uri_for('/static', 'images', 'emblem-urgent.png') %]"
 class="notice" title="Ce compte est expiré ([% object.get_attributes('expired') %])" alt="expired">
     [% ELSIF object.get_attributes('expire') %]
-<img src="[% c.uri_for('/static', 'icons', 'appointment-new.png') %]"
+<img src="[% c.uri_for('/static', 'images', 'appointment-new.png') %]"
 class="notice" title="Ce compte est temporaire ([% object.get_attributes('expire') %])" alt="temporary">
     [% END %]
 [% ELSE %]
     [% IF object.get_attributes('unexported') %]
-<img src="[% c.uri_for('/static', 'icons', 'gtk-delete.png') %]"
+<img src="[% c.uri_for('/static', 'images', 'gtk-delete.png') %]"
 class="notice" title="Cette entrée est désactivés" alt="disable">
     [% END %]