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

Timestamp:

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

Author:

nanardon

Message:

fix conflict

Location:

trunk/LATMOS-Accounts-Web/root/html/includes

Files:

• defs.tt (modified) (1 diff)
• form.tt (modified) (2 diffs)
• header.tt (modified) (2 diffs)
• list_objects.tt (modified) (1 diff)
• obj_prev_next.tt (modified) (2 diffs)
• sidebar.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 %]

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

@@ -1 +1 @@
 <!-- $Id$ -->
 
-<div id="oform" class="oform">
 [% attributes = form.attributes() %]
 [% IF attributes.0 %]
@@ -34 +33 @@
 [% perm_denied %]
 [% END %]
-</div>

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

@@ -44 +44 @@
 </div><!-- #header -->
 
-<div style="float: left;" id="sidebar">
+<div id="sidebar">
     [% INCLUDE 'includes/sidebar.tt' %]
     [% tpl = c.namespace _ '/side_menu.tt' %]
@@ -54 +54 @@
 </div>
 
-<div id="mainbox" style="float: left;">
+<div id="mainbox">
 

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

@@ -39 +39 @@
     </td>
     <td><a href="[% c.uri_for('/' _ c.forward('/obj_to_uri', [ ofilter.otype ]), object.id) %]">
-        <img src="[% c.uri_for('/static', 'icons', 'icon_edit.png') %]"
-            height="16" width="16"
+        <img src="[% c.uri_for('/static', 'images', 'icon_edit.png') %]"
+            class="editobj"
             alt="[% "edit " _ object.id | html %]"></a>
     [% object.id | html %]</td>

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

@@ -1 +1 @@
 <!-- $Id$ -->
 
-<div id="navigate" style="float: right">
+<div id="navigate">
 <p>
 [% nav = c.model('Accounts').object_navigate(objtype, objname) %]
 
-[% IF nav.ofirst %]
+[% IF nav.ofirst -%]
 <a href="[% c.uri_for(nav.ofirst, subform) %]">
-<img src="[% c.uri_for('/static', 'icons/gtk-goto-first-ltr.png') %]" title="[%
-nav.ofirst | html %]" alt="first">
-</a>
-[% END %]
+<img src="[% c.uri_for('/static', 'images', 'gtk-goto-first-ltr.png') %]" title="[%
+nav.ofirst | html %]" alt="first" class="attr"></a>
+[%- END %]
 
 [% IF nav.oprev %]
 <a href="[% c.uri_for(nav.oprev, subform) %]">
-<img src="[% c.uri_for('/static', 'icons/gtk-go-back-ltr.png') %]" title="[%
-nav.oprev | html %]" alt="previous">
-</a>
+<img src="[% c.uri_for('/static', 'images', 'gtk-go-back-ltr.png') %]" title="[%
+nav.oprev | html %]" alt="previous" class="attr"></a>
 [% END %]
 
 [% IF nav.onext %]
 <a href="[% c.uri_for(nav.onext, subform) %]">
-<img src="[% c.uri_for('/static', 'icons/gtk-go-back-rtl.png') %]" title="[%
-nav.onext | html %]" alt="next">
-</a>
+<img src="[% c.uri_for('/static', 'images', 'gtk-go-back-rtl.png') %]" title="[%
+nav.onext | html %]" alt="next" class="attr"></a>
 [% END %]
 
 [% IF nav.olast %]
 <a href="[% c.uri_for(nav.olast, subform) %]">
-<img src="[% c.uri_for('/static', 'icons/gtk-goto-first-rtl.png') %]" title="[%
-nav.olast | html %]" alt="last">
-</a>
+<img src="[% c.uri_for('/static', 'images', 'gtk-goto-first-rtl.png') %]" title="[%
+nav.olast | html %]" alt="last" class="attr"></a>
 [% END %]
 </p>
@@ -46 +42 @@
 </select>
 <input type="image" alt="Go To" title="Aller à " src="[%
-c.uri_for('/static', 'icons', 'gtk-jump-to-rtl.png') %]">
+c.uri_for('/static', 'images', 'gtk-jump-to-rtl.png') %]" class="attrbutton">
 </p>
 </form>

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

@@ -1 +1 @@
 <form action="[% c.uri_for('/search') %]">
 <input name="q" value="[% c.req.param('q') | html %]">
-<input type="image" name="" src="[% c.uri_for('/static', 'icons', 'gtk-find.png') %]" height="16" width="16">
+<input type="image" name="" src="[% c.uri_for('/static', 'images', 'gtk-find.png') %]" height="16" width="16">
 </form>
 <ul>