Index: trunk/LATMOS-Accounts-Web/MANIFEST
===================================================================
--- trunk/LATMOS-Accounts-Web/MANIFEST	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/MANIFEST	(revision 1162)
@@ -124,35 +124,17 @@
 root/html/users/passwd.tt
 root/html/users/side_menu.tt
-root/static/icons/add.png
-root/static/icons/appointment-new.png
 root/static/icons/appointment-soon.png
 root/static/icons/arrow-right.png
-root/static/icons/avatar-default.png
-root/static/icons/changes-prevent.png
 root/static/icons/dialog-cancel.png
 root/static/icons/dialog-password.png
 root/static/icons/document-save-as.png
 root/static/icons/document-save.png
-root/static/icons/editclear.png
-root/static/icons/emblem-default.png
-root/static/icons/emblem-favorite.png
-root/static/icons/emblem-urgent.png
 root/static/icons/expired.png
-root/static/icons/find.png
 root/static/icons/gnome-session-logout.png
 root/static/icons/gnome-stock-mail-snd.png
 root/static/icons/gtk-about.png
-root/static/icons/gtk-add.png
 root/static/icons/gtk-cancel.png
 root/static/icons/gtk-close.png
-root/static/icons/gtk-delete.png
 root/static/icons/gtk-execute.png
-root/static/icons/gtk-find.png
-root/static/icons/gtk-go-back-ltr.png
-root/static/icons/gtk-go-back-rtl.png
-root/static/icons/gtk-goto-first-ltr.png
-root/static/icons/gtk-goto-first-rtl.png
-root/static/icons/gtk-home.png
-root/static/icons/gtk-jump-to-rtl.png
 root/static/icons/gtk-refresh.png
 root/static/icons/help-contents.png
@@ -167,16 +149,11 @@
 root/static/icons/stock_smiley-22.png
 root/static/icons/system-config-users.png
-root/static/icons/system-users.png
-root/static/icons/user-group-delete.png
-root/static/icons/user-group-new.png
-root/static/icons/user-group-properties.png
 root/static/icons/user-info.png
 root/static/icons/user-invisible.png
-root/static/icons/user-properties.png
-root/static/icons/user-trash.png
-root/static/icons/video-display.png
 root/static/icons/view-calendar-day.png
 root/static/icons/view-media-artist.png
-root/static/icons/xfce-internet.png
+root/static/images/add.png
+root/static/images/appointment-new.png
+root/static/images/avatar-default.png
 root/static/images/btn_120x50_built.png
 root/static/images/btn_120x50_built_shadow.png
@@ -188,13 +165,43 @@
 root/static/images/btn_88x31_powered_shadow.png
 root/static/images/catalyst_logo.png
+root/static/images/changes-prevent.png
 root/static/images/contact-new.png
 root/static/images/dialog-cancel.png
 root/static/images/dialog-ok-apply.png
 root/static/images/edit-delete.png
+root/static/images/edit-disable.png
+root/static/images/edit-enable.png
+root/static/images/editclear.png
+root/static/images/emblem-default.png
+root/static/images/emblem-favorite.png
+root/static/images/emblem-urgent.png
+root/static/images/find.png
+root/static/images/group_conf.png
+root/static/images/group_del.png
+root/static/images/gtk-add.png
+root/static/images/gtk-delete.png
+root/static/images/gtk-find.png
+root/static/images/gtk-go-back-ltr.png
+root/static/images/gtk-go-back-rtl.png
+root/static/images/gtk-goto-first-ltr.png
+root/static/images/gtk-goto-first-rtl.png
+root/static/images/gtk-home.png
+root/static/images/gtk-jump-to-rtl.png
+root/static/images/icon_edit.png
+root/static/images/locked.png
+root/static/images/logviewer.png
 root/static/images/mail-mark-important.png
 root/static/images/mail-mark-junk.png
 root/static/images/mail-mark-unread-new.png
 root/static/images/mail-mark-unread.png
+root/static/images/mail-read.png
+root/static/images/mail_forward.png
+root/static/images/network-workgroup.png
+root/static/images/preferences-desktop-wallpaper.png
 root/static/images/process-stop.png
+root/static/images/site_conf.png
+root/static/images/system-users.png
+root/static/images/user-trash.png
+root/static/images/video-display.png
 root/static/images/view-media-artist.png
 root/static/images/view-pim-contacts.png
Index: trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Aliases.pm
===================================================================
--- trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Aliases.pm	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Aliases.pm	(revision 1162)
@@ -32,10 +32,5 @@
 
     my $db = $c->model('Accounts')->db;
-    if ($c->req->param('delete')) {
-        $db->delete_object('aliases', $alias);
-        $db->commit;
-        $c->res->redirect($c->uri_for('/aliases'));
-        return;
-    }
+
     my $oalias = $db->get_object('aliases', $alias);
     $c->stash->{aliasesname} = $alias;
@@ -44,5 +39,22 @@
 
     $c->stash->{form} = $c->model('AttrForms', 'aliases', $oalias);
-    $c->stash->{form}->set_attrs;
+
+    if ($c->req->param('make_active')) {
+        $c->stash->{aliases}->set_c_fields('exported' => 1);
+        $db->commit;
+    }
+    elsif ($c->req->param('make_inactive')) {
+        $c->stash->{aliases}->set_c_fields('exported' => 0);
+        $db->commit;
+    }
+    elsif ($c->req->param('delete')) {
+        $db->delete_object('aliases', $alias);
+        $db->commit;
+        $c->res->redirect('/aliases');
+        return;
+    }
+    else {
+        $c->stash->{form}->set_attrs;
+    }
 }
 
Index: trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Groups.pm
===================================================================
--- trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Groups.pm	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Groups.pm	(revision 1162)
@@ -41,4 +41,18 @@
         return;
     };
+
+    if ($c->req->param('make_active')) {
+        $c->stash->{group}->set_c_fields('exported' => 1);
+        $base->commit;
+    }
+    if ($c->req->param('make_inactive')) {
+        $c->stash->{group}->set_c_fields('exported' => 0);
+        $base->commit;
+    }
+    if ($c->req->param('delete')) {
+        $base->delete_object('group', $groupname);
+        $base->commit;
+        $c->res->redirect('/groups');
+    }
 
     $c->stash->{subform} = $subform || '';
Index: trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/NetHosts.pm
===================================================================
--- trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/NetHosts.pm	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/NetHosts.pm	(revision 1162)
@@ -69,11 +69,17 @@
             $base->rollback;
         }
-    } elsif ($c->req->param('delete')) {
-        if ($base->delete_object('nethost', $nethostname)) {
-            $base->commit;
-            $c->res->redirect('/nethosts');
-        } else {
-            $base->rollback;
-        }
+    } elsif ($c->req->param('make_active')) {
+        $c->stash->{nethost}->set_c_fields('exported' => 1);
+        $base->commit;
+    }
+    elsif ($c->req->param('make_inactive')) {
+        $c->stash->{nethost}->set_c_fields('exported' => 0);
+        $base->commit;
+    }
+    elsif ($c->req->param('delete')) {
+        $base->delete_object('nethost', $nethostname);
+        $base->commit;
+        $c->res->redirect('/nethosts');
+
     } else {
         $c->stash->{form}->set_attrs;
Index: trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/NetZones.pm
===================================================================
--- trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/NetZones.pm	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/NetZones.pm	(revision 1162)
@@ -41,4 +41,18 @@
     $c->stash->{form} = $c->model('AttrForms', 'netzone', $c->stash->{netzone});
     $c->stash->{form}->set_attrs;
+
+    if ($c->req->param('make_active')) {
+        $c->stash->{netzone}->set_c_fields('exported' => 1);
+        $base->commit;
+    }
+    if ($c->req->param('make_inactive')) {
+        $c->stash->{netzone}->set_c_fields('exported' => 0);
+        $base->commit;
+    }
+    if ($c->req->param('delete')) {
+        $base->delete_object('netzone', $netzonename);
+        $base->commit;
+        $c->res->redirect('/netzones');
+    }
 }
 
Index: trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Sites.pm
===================================================================
--- trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Sites.pm	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Sites.pm	(revision 1162)
@@ -41,4 +41,18 @@
     };
 
+    if ($c->req->param('make_active')) {
+        $c->stash->{site}->set_c_fields('exported' => 1);
+        $base->commit;
+    }
+    if ($c->req->param('make_inactive')) {
+        $c->stash->{site}->set_c_fields('exported' => 0);
+        $base->commit;
+    }
+    if ($c->req->param('delete')) {
+        $base->delete_object('site', $sitename);
+        $base->commit;
+        $c->res->redirect('/sites');
+    }
+
     $c->stash->{subform} = $subform || '';
 
Index: trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Users.pm
===================================================================
--- trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Users.pm	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Users.pm	(revision 1162)
@@ -75,4 +75,13 @@
         $c->stash->{user}->set_c_fields('exported' => 1);
         $base->commit;
+    }
+    if ($c->req->param('make_inactive')) {
+        $c->stash->{user}->set_c_fields('exported' => 0);
+        $base->commit;
+    }
+    if ($c->req->param('delete')) {
+        $base->delete_object('user', $username);
+        $base->commit;
+        $c->res->redirect('/users');
     }
 
Index: trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm
===================================================================
--- trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm	(revision 1162)
@@ -562,5 +562,5 @@
                 '$attr'.replace(/SUBID/g, cn );
             document.getElementById('${htmlname}_div_' + (cn - 1)).innerHTML +=
-                '<div id="${htmlname}_div_'+ cn +'"></div>';
+                '<div id="${htmlname}_div_'+ cn +'" style="display:block"></div>';
             %s
             }
@@ -571,5 +571,5 @@
         $addempty .= "\n";
         $addempty .=
-            qq|<button type="button" onclick="add_${htmlname}()">+</button>|,
+            qq|<button type="button" style="display:block" onclick="add_${htmlname}()">+</button>|,
 
         push(@html_fields, $addempty);
Index: trunk/LATMOS-Accounts-Web/root/html/admin/index.tt
===================================================================
--- trunk/LATMOS-Accounts-Web/root/html/admin/index.tt	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/root/html/admin/index.tt	(revision 1162)
@@ -9,5 +9,5 @@
     onMouseOut="resetmenu();"
     >
-    <img title="Utilisateurs" src="[% c.uri_for('/static', 'icons', 'avatar-default.png') %]"></a>
+    <img title="Utilisateurs" src="[% c.uri_for('/static', 'images', 'avatar-default.png') %]"></a>
 [% IF c.model('Accounts').db.check_acl('user', '@CREATE', 'w') %]
     <a href="[% c.uri_for('/create', 'user') %]"
@@ -15,5 +15,5 @@
     onMouseOut="resetmenu();"
     >
-    <img title="Ajouter un utilisateurs" src="[% c.uri_for('/static', 'icons', 'add.png') %]"></a>
+    <img title="Ajouter un utilisateurs" src="[% c.uri_for('/static', 'images', 'add.png') %]"></a>
 [% END %]
 </td>
@@ -26,5 +26,5 @@
     onMouseOut="resetmenu();"
     >
-    <img title="Groupes" src="[% c.uri_for('/static', 'icons', 'system-users.png') %]"></a>
+    <img title="Groupes" src="[% c.uri_for('/static', 'images', 'system-users.png') %]"></a>
 [% IF c.model('Accounts').db.check_acl('group', '@CREATE', 'w') %]
     <a href="[% c.uri_for('/create', 'group') %]"
@@ -32,5 +32,5 @@
     onMouseOut="resetmenu();"
     >
-    <img title="Ajouter un groupe" src="[% c.uri_for('/static', 'icons', 'add.png') %]"></a>
+    <img title="Ajouter un groupe" src="[% c.uri_for('/static', 'images', 'add.png') %]"></a>
 [% END %]
 </td>
@@ -43,5 +43,5 @@
     onMouseOut="resetmenu();"
     >
-    <img title="HÃŽtes rÃ©seau" src="[% c.uri_for('/static', 'icons', 'video-display.png') %]"></a>
+    <img title="HÃŽtes rÃ©seau" src="[% c.uri_for('/static', 'images', 'video-display.png') %]"></a>
 [% IF c.model('Accounts').db.check_acl('nethost', '@CREATE', 'w') %]
     <a href="[% c.uri_for('/create', 'nethost') %]"
@@ -49,5 +49,5 @@
     onMouseOut="resetmenu();"
     >
-    <img title="Ajouter un hÃŽte rÃ©seau" src="[% c.uri_for('/static', 'icons', 'add.png') %]"></a>
+    <img title="Ajouter un hÃŽte rÃ©seau" src="[% c.uri_for('/static', 'images', 'add.png') %]"></a>
 [% END %]
 </td>
@@ -61,5 +61,5 @@
     onMouseOut="resetmenu();"
     >
-    <img title="Annuaires" src="[% c.uri_for('/static', 'icons', 'logviewer.png') %]"></a>
+    <img title="Annuaires" src="[% c.uri_for('/static', 'images', 'logviewer.png') %]"></a>
 </td></tr>
 [% END %]
@@ -71,5 +71,12 @@
     onMouseOut="resetmenu();"
     >
-    <img title="Sites" src="[% c.uri_for('/static', 'icons', 'xfce-internet.png') %]"></a>
+    <img title="Sites" src="[% c.uri_for('/static', 'images', 'site_conf.png') %]"></a>
+[% IF c.model('Accounts').db.check_acl('nethost', '@CREATE', 'w') %]
+    <a href="[% c.uri_for('/create', 'site') %]"
+    onMouseOver="document.getElementById('menui').innerHTML='Ajouter un site';"
+    onMouseOut="resetmenu();"
+    >
+    <img title="Ajouter un hÃŽte rÃ©seau" src="[% c.uri_for('/static', 'images', 'add.png') %]"></a>
+[% END %]
 </td>
 <td>
@@ -86,5 +93,5 @@
     onMouseOut="resetmenu();"
     >
-    <img title="Alias mail" src="[% c.uri_for('/static', 'icons', 'mail_forward.png') %]"></a>
+    <img title="Alias mail" src="[% c.uri_for('/static', 'images', 'mail_forward.png') %]"></a>
 [% IF c.model('Accounts').db.check_acl('aliases', '@CREATE', 'w') %]
     <a href="[% c.uri_for('/create', 'aliases') %]"
@@ -92,5 +99,5 @@
     onMouseOut="resetmenu();"
     >
-    <img title="Ajouter un utilisateurs" src="[% c.uri_for('/static', 'icons', 'add.png') %]"></a>
+    <img title="Ajouter un utilisateurs" src="[% c.uri_for('/static', 'images', 'add.png') %]"></a>
 [% END %]
 </td>
@@ -109,9 +116,9 @@
     onMouseOut="resetmenu();"
     >
-    <img title="Gestion RÃ©seau" src="[% c.uri_for('/static', 'icons', 'network-workgroup.png') %]"></a>
+    <img title="Gestion RÃ©seau" src="[% c.uri_for('/static', 'images', 'network-workgroup.png') %]"></a>
     <a href="[% c.uri_for('/create', 'netzone') %]"
     onMouseOver="document.getElementById('menui').innerHTML='Ajouter une zones rÃ©seau';"
     onMouseOut="resetmenu();"
-    ><img title="Ajouter une zone" src="[% c.uri_for('/static', 'icons', 'add.png') %]"></a>
+    ><img title="Ajouter une zone" src="[% c.uri_for('/static', 'images', 'add.png') %]"></a>
 </td>
 <td>
@@ -123,5 +130,5 @@
     onMouseOver="document.getElementById('menui').innerHTML='Demandes';"
     onMouseOut="resetmenu();">
-    <img title="Demandes" src="[% c.uri_for('/static', 'icons', 'logviewer.png') %]"></a>
+    <img title="Demandes" src="[% c.uri_for('/static', 'images', 'logviewer.png') %]"></a>
 </td>
 <td>
Index: trunk/LATMOS-Accounts-Web/root/html/admin/requests/update.tt
===================================================================
--- trunk/LATMOS-Accounts-Web/root/html/admin/requests/update.tt	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/root/html/admin/requests/update.tt	(revision 1162)
@@ -11,5 +11,5 @@
     onMouseOver="document.getElementById('menui').innerHTML='Demandes';"
     onMouseOut="resetmenu();">
-    <img title="Demandes" src="[% c.uri_for('/static', 'icons', 'logviewer.png')
+    <img title="Demandes" src="[% c.uri_for('/static', 'images', 'logviewer.png')
 %]">
 Revenir Ã  la liste des requÃªtes en attentes.
Index: trunk/LATMOS-Accounts-Web/root/html/ajax/services/mailing/dest_list.tt
===================================================================
--- trunk/LATMOS-Accounts-Web/root/html/ajax/services/mailing/dest_list.tt	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/root/html/ajax/services/mailing/dest_list.tt	(revision 1162)
@@ -15,6 +15,7 @@
     </td>
 <td>
-[% c.prototype.link_to_remote( '<img src="' _ c.uri_for('/static/icons',
-'user-trash.png') _ '" height="24" width="24" alt="" title="Retirer ' _ disp _ '">', {
+[% c.prototype.link_to_remote(
+    '<img src="' _ c.uri_for('/static', 'images', 'user-trash.png' ) _ '"
+    height="24" width="24" alt="" title="Retirer ' _ disp _ '">', {
     update => 'destlist',
     url    => c.uri_for('/ajax', 'services', 'mailing', 'mod_to', {
Index: trunk/LATMOS-Accounts-Web/root/html/ajax/services/mailing/users_list.tt
===================================================================
--- trunk/LATMOS-Accounts-Web/root/html/ajax/services/mailing/users_list.tt	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/root/html/ajax/services/mailing/users_list.tt	(revision 1162)
@@ -11,12 +11,14 @@
     </td>
     <td><input type=checkbox name="user" checked=1 value="[% u | html %]">
-[%  c.prototype.link_to_remote( '<img src="' _ c.uri_for('/static/icons',
-'gtk-add.png') _ '" height="24" width="24" alt="" title="Ajouter ' _ disp _ '">', {
-    update => 'destlist',
-    url    => c.uri_for('/ajax', 'services', 'mailing', 'mod_to', {
-        'act'  => 'add_to',
-        'user' => u,
-    })
-}, { entities => '' } ) %]
+    [% c.prototype.link_to_remote(
+        '<img src="' _ c.uri_for('/static', 'icons', 'gtk-add.png') _ '" height="24" width="24" alt="" title="Ajouter ' _ disp _ '">',
+        {
+        update => 'destlist',
+        url    => c.uri_for('/ajax', 'services', 'mailing', 'mod_to', {
+            'act'  => 'add_to',
+            'user' => u,
+        })
+        },
+    { entities => '' } ) %]
     </td>
 </tr>
Index: trunk/LATMOS-Accounts-Web/root/html/ajax/user_to_group_form.tt
===================================================================
--- trunk/LATMOS-Accounts-Web/root/html/ajax/user_to_group_form.tt	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/root/html/ajax/user_to_group_form.tt	(revision 1162)
@@ -3,8 +3,12 @@
 
 [% FOREACH g = othergroups %]
+[% IF loop.first %]
+<ul>
+[% END %]
+<li>
 [% IF modallow %]
 <form action="[% c.uri_for('/users', user.id, 'groups') %]" method="POST">
 <input type="hidden" name="addgroup" value="[% g | html %]">
-<input type="image" src="[% c.uri_for('/static', 'icons', 'user-group-new.png')
+<input type="image" src="[% c.uri_for('/static', 'images', 'group_conf.png')
 %]" width="24" height="24">
 [% END %]
@@ -13,3 +17,7 @@
 </form>
 [% END %]
+</li>
+[% IF loop.last %]
+</ul>
 [% END %]
+[% END %]
Index: trunk/LATMOS-Accounts-Web/root/html/aliases/default.tt
===================================================================
--- trunk/LATMOS-Accounts-Web/root/html/aliases/default.tt	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/root/html/aliases/default.tt	(revision 1162)
@@ -1,5 +1,4 @@
 <!-- $Id$ -->
 
-<div id="objectform" class="objectform">
 <div id="oinfo">
 [% INCLUDE 'includes/obj_prev_next.tt' objtype='aliases' objname=aliasesname %]
@@ -7,8 +6,8 @@
     <div id="oinfo_icons">
     [% IF NOT aliases.get_c_field('exported') %]
-    <img src="[% c.uri_for('/static', 'icons', 'mail-mark-important.png') %]"
+    <img src="[% c.uri_for('/static', 'images', 'mail-mark-important.png') %]"
     alt="[% "User " _ aliasesname %]" title="l'alias est dÃ©sactivÃ©">
     [% ELSE %]
-    <img src="[% c.uri_for('/static', 'icons', 'mail-read.png') %]"
+    <img src="[% c.uri_for('/static', 'images', 'mail-read.png') %]"
     alt="[% "User " _ aliasesname %]">
     [% END %]
@@ -17,7 +16,35 @@
     <p id="oname">[% aliasesname | html %]</span></p>
     </div>
+</div>
 
+<div id="oaction">
+[% IF c.model('Accounts').db.check_acl(aliases, 'exported', 'w') %]
+    [% IF NOT aliases.get_c_field('exported') %]
+    <form method="POST" action="[% c.uri_for('/aliases', aliasesname, subform) %]"
+          onSubmit="return confirm('Activer l\'alias mail [% aliasesname %] ?') ? true : false">
+    <input type="image" name="delete" value="Supprimer" title="Supprimer"
+    alt="effacer" src="[% c.uri_for('/static', 'images', 'edit-enable.png') %]">
+    <input type="hidden" value="activer" name="make_active">
+    </form>
+    [% ELSE %]
+    <form method="POST" action="[% c.uri_for('/aliases', aliasesname, subform) %]"
+          onSubmit="return confirm('DÃ©sactiver l\'alias mail [% aliasesname %] ?') ? true : false">
+    <input type="image" name="delete" value="Supprimer" title="Supprimer"
+    alt="effacer" src="[% c.uri_for('/static', 'images', 'edit-disable.png') %]">
+    <input type="hidden" value="dÃ©sactiver" name="make_inactive">
+    </form>
+    [% END %]
+[% END %]
+[% IF c.model('Accounts').db.check_acl(aliases, 'DELETE', 'w') %]
+    <form method="POST" action="[% c.uri_for('/aliases', aliasesname, subform) %]"
+          onSubmit="return confirm('DÃ©truire l\'alias mail [% aliasesname %] ?') ? true : false">
+    <input type="image" name="delete" value="Supprimer" title="Supprimer"
+    alt="effacer" src="[% c.uri_for('/static', 'images', 'edit-delete.png') %]">
+    <input type="hidden" value="DETRUIRE" name="delete">
+    </form>
+[% END %]
 </div>
-<div id="oinfo_close"></div>
+
+<div id="objectform" class="objectform">
 
 [% IF c.model('Accounts').db.check_acl('aliases', 'forward', 'w') %]
@@ -25,27 +52,4 @@
 [% INCLUDE 'includes/form.tt' %]
 
-[% IF c.model('Accounts').db.check_acl('aliases', '@DELETE', 'w') %]
-<script LANGUAGE="JavaScript">
-<!-- 
-function confirmSubmit()
-{
-var agree=confirm("Supprimer l'alias [% aliases.id %] ?");
-if (agree)
-    return true ;
-else
-    return false ;
-}
-// -->
-</script>
-<fieldset>
-<legend>Supprimer cet alias</legend>
-<form action="[% c.uri_for(aliases.id) %]" method="POST" onsubmit="return confirmSubmit()">
-<input type="image" name="delete" value="Supprimer" title="Supprimer"
-alt="effacer" src="[%
-c.uri_for('/static', 'images', 'edit-delete.png') %]">
-<input type="hidden" name="delete" value="Supprimer">
-</form>
-</fieldset>
-[% END %]
 </div>
 
Index: trunk/LATMOS-Accounts-Web/root/html/groups/object_header.tt
===================================================================
--- trunk/LATMOS-Accounts-Web/root/html/groups/object_header.tt	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/root/html/groups/object_header.tt	(revision 1162)
@@ -4,6 +4,11 @@
 <div id="oinfo">
     <div id="oinfo_icons">
-    <img src="[% c.uri_for('/static', 'icons', 'user-group-properties.png') %]"
+    [% IF group.get_c_field('exported') %]
+    <img src="[% c.uri_for('/static', 'images', 'group_conf.png') %]"
     alt="[% "Groupe " _ groupname %]">
+    [% ELSE %]
+    <img src="[% c.uri_for('/static', 'images', 'gtk-delete.png') %]"
+    alt="[% "Groupe " _ groupname %]">
+    [% END %]
     </div>
 
@@ -13,5 +18,32 @@
     </div>
 </div>
-<div id="oinfo_close"></div>
+
+<div id="oaction">
+[% IF c.model('Accounts').db.check_acl(group, 'exported', 'w') %]
+    [% IF NOT group.get_c_field('exported') %]
+    <form method="POST" action="[% c.uri_for('/groups', groupname, subform) %]"
+          onSubmit="return confirm('Activer le groupe [% groupname %] ?') ? true : false">
+    <input type="image" name="delete" value="Supprimer" title="Supprimer"
+    alt="effacer" src="[% c.uri_for('/static', 'images', 'edit-enable.png') %]">
+    <input type="hidden" value="activer" name="make_active">
+    </form>
+    [% ELSE %]
+    <form method="POST" action="[% c.uri_for('/groups', groupname, subform) %]"
+          onSubmit="return confirm('DÃ©sactiver le group [% groupname %] ?') ? true : false">
+    <input type="image" name="delete" value="Supprimer" title="Supprimer"
+    alt="effacer" src="[% c.uri_for('/static', 'images', 'edit-disable.png') %]">
+    <input type="hidden" value="dÃ©sactiver" name="make_inactive">
+    </form>
+    [% END %]
+[% END %]
+[% IF c.model('Accounts').db.check_acl(group, 'DELETE', 'w') %]
+    <form method="POST" action="[% c.uri_for('/groups', groupname, subform) %]"
+          onSubmit="return confirm('DÃ©truire le groupe [% groupname %] ?') ? true : false">
+    <input type="image" name="delete" value="Supprimer" title="Supprimer"
+    alt="effacer" src="[% c.uri_for('/static', 'images', 'edit-delete.png') %]">
+    <input type="hidden" value="DETRUIRE" name="delete">
+    </form>
+[% END %]
+</div>
 
 <div id="omenu">
Index: trunk/LATMOS-Accounts-Web/root/html/groups/users.tt
===================================================================
--- trunk/LATMOS-Accounts-Web/root/html/groups/users.tt	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/root/html/groups/users.tt	(revision 1162)
@@ -34,10 +34,10 @@
 [% IF ouser.get_attributes('department') == group.id OR
       ouser.get_attributes('contratType') == group.id %]
-<img src="[% c.uri_for('/static', 'icons', 'changes-prevent.png') %]"
+<img src="[% c.uri_for('/static', 'images', 'changes-prevent.png') %]"
     width="24" height="24" title="Ce groupe est gÃ©rÃ© via un autre attribut">
 [% ELSE %]
 <form action="[% c.uri_for(groupname, subform) %]" method="POST" style="display: inline">
 <input type="hidden" name="deluser" value="[% uid | html %]">
-<input type="image" src="[% c.uri_for('/static', 'icons', 'user-group-delete.png') %]" width="24" height="24">
+<input type="image" src="[% c.uri_for('/static', 'images', 'group_del.png') %]" width="24" height="24">
 </form>
 [% END %]
Index: trunk/LATMOS-Accounts-Web/root/html/includes/defs.tt
===================================================================
--- trunk/LATMOS-Accounts-Web/root/html/includes/defs.tt	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/root/html/includes/defs.tt	(revision 1162)
@@ -13,16 +13,16 @@
 [% 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 %]
Index: trunk/LATMOS-Accounts-Web/root/html/includes/form.tt
===================================================================
--- trunk/LATMOS-Accounts-Web/root/html/includes/form.tt	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/root/html/includes/form.tt	(revision 1162)
@@ -1,5 +1,4 @@
 <!-- $Id$ -->
 
-<div id="oform" class="oform">
 [% attributes = form.attributes() %]
 [% IF attributes.0 %]
@@ -34,3 +33,2 @@
 [% perm_denied %]
 [% END %]
-</div>
Index: trunk/LATMOS-Accounts-Web/root/html/includes/header.tt
===================================================================
--- trunk/LATMOS-Accounts-Web/root/html/includes/header.tt	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/root/html/includes/header.tt	(revision 1162)
@@ -44,5 +44,5 @@
 </div><!-- #header -->
 
-<div style="float: left;" id="sidebar">
+<div id="sidebar">
     [% INCLUDE 'includes/sidebar.tt' %]
     [% tpl = c.namespace _ '/side_menu.tt' %]
@@ -54,4 +54,4 @@
 </div>
 
-<div id="mainbox" style="float: left;">
+<div id="mainbox">
 
Index: trunk/LATMOS-Accounts-Web/root/html/includes/list_objects.tt
===================================================================
--- trunk/LATMOS-Accounts-Web/root/html/includes/list_objects.tt	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/root/html/includes/list_objects.tt	(revision 1162)
@@ -39,6 +39,6 @@
     </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>
Index: trunk/LATMOS-Accounts-Web/root/html/includes/obj_prev_next.tt
===================================================================
--- trunk/LATMOS-Accounts-Web/root/html/includes/obj_prev_next.tt	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/root/html/includes/obj_prev_next.tt	(revision 1162)
@@ -1,34 +1,30 @@
 <!-- $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,5 +42,5 @@
 </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>
Index: trunk/LATMOS-Accounts-Web/root/html/includes/sidebar.tt
===================================================================
--- trunk/LATMOS-Accounts-Web/root/html/includes/sidebar.tt	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/root/html/includes/sidebar.tt	(revision 1162)
@@ -1,5 +1,5 @@
 <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>
Index: trunk/LATMOS-Accounts-Web/root/html/nethosts/default.tt
===================================================================
--- trunk/LATMOS-Accounts-Web/root/html/nethosts/default.tt	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/root/html/nethosts/default.tt	(revision 1162)
@@ -62,27 +62,4 @@
 [% END %]
 
-[% IF c.model('Accounts').db.check_acl('nethost', '@DELETE', 'w') %]
-<script LANGUAGE="JavaScript">
-<!--
-function confirmSubmit()
-{
-var agree=confirm("Supprimer l'hÃŽte [% nethost.id %] ?");
-if (agree)
-    return true ;
-else
-    return false ;
-}
-// -->
-</script>
-<fieldset>
-<legend>Supprimer cet hÃŽte</legend>
-<form action="[% c.uri_for(nethostname) %]" method="POST" onsubmit="return confirmSubmit()">
-<input type="image" name="delete" value="Supprimer" title="Supprimer" alt="effacer" src="[%
-c.uri_for('/static', 'images', 'edit-delete.png') %]">
-<input type="hidden" name="delete" value="Supprimer">
-</form>
-</fieldset>
-[% END %]
-
 </td></tr>
 </table>
Index: trunk/LATMOS-Accounts-Web/root/html/nethosts/object_header.tt
===================================================================
--- trunk/LATMOS-Accounts-Web/root/html/nethosts/object_header.tt	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/root/html/nethosts/object_header.tt	(revision 1162)
@@ -6,8 +6,8 @@
     <div id="oinfo_icons">
     [% IF NOT nethost.get_c_field('exported') %]
-    <img src="[% c.uri_for('/static', 'icons', 'gtk-delete.png') %]"
+    <img src="[% c.uri_for('/static', 'images', 'gtk-delete.png') %]"
     alt="[% "HÃŽte " _ nethostname %]" title="l'entrÃ©e est dÃ©sactivÃ©e">
     [% ELSE %]
-    <img src="[% c.uri_for('/static', 'icons', 'preferences-desktop-wallpaper.png') %]"
+    <img src="[% c.uri_for('/static', 'images', 'preferences-desktop-wallpaper.png') %]"
     alt="[% "Ordinateur " _ nethostname %]">
     [% END %]
@@ -19,3 +19,30 @@
     </div>
 </div>
-<div id="oinfo_close"></div>
+
+<div id="oaction">
+[% IF c.model('Accounts').db.check_acl(nethost, 'exported', 'w') %]
+    [% IF NOT nethost.get_c_field('exported') %]
+    <form method="POST" action="[% c.uri_for('/nethosts', nethostname, subform) %]"
+          onSubmit="return confirm('Activer l\'hÃŽte [% nethostname %] ?') ? true : false">
+    <input type="image" name="delete" value="Supprimer" title="Supprimer"
+    alt="effacer" src="[% c.uri_for('/static', 'images', 'edit-enable.png') %]">
+    <input type="hidden" value="activer" name="make_active">
+    </form>
+    [% ELSE %]
+    <form method="POST" action="[% c.uri_for('/nethosts', nethostname, subform) %]"
+          onSubmit="return confirm('DÃ©sactiver l\'hÃŽte [% nethostname %] ?') ? true : false">
+    <input type="image" name="delete" value="Supprimer" title="Supprimer"
+    alt="effacer" src="[% c.uri_for('/static', 'images', 'edit-disable.png') %]">
+    <input type="hidden" value="dÃ©sactiver" name="make_inactive">
+    </form>
+    [% END %]
+[% END %]
+[% IF c.model('Accounts').db.check_acl(nethost, 'DELETE', 'w') %]
+    <form method="POST" action="[% c.uri_for('/nethosts', nethostname, subform) %]"
+          onSubmit="return confirm('DÃ©truire l\'hÃŽte [% nethostname %] ?') ? true : false">
+    <input type="image" name="delete" value="Supprimer" title="Supprimer"
+    alt="effacer" src="[% c.uri_for('/static', 'images', 'edit-delete.png') %]">
+    <input type="hidden" value="DETRUIRE" name="delete">
+    </form>
+[% END %]
+</div>
Index: trunk/LATMOS-Accounts-Web/root/html/netzones/default.tt
===================================================================
--- trunk/LATMOS-Accounts-Web/root/html/netzones/default.tt	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/root/html/netzones/default.tt	(revision 1162)
@@ -7,9 +7,7 @@
 
 <div class="objectformleft" id="objectform">
-<div class="oform">
 [% INCLUDE 'includes/form.tt'
     form = form
     form_uri = c.uri_for(netzonename) %]
-</div>
 
 <table border=1>
Index: trunk/LATMOS-Accounts-Web/root/html/netzones/menu.tt
===================================================================
--- trunk/LATMOS-Accounts-Web/root/html/netzones/menu.tt	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/root/html/netzones/menu.tt	(revision 1162)
@@ -4,5 +4,5 @@
 <div id="oinfo">
     <div id="oinfo_icons">
-    <img src="[% c.uri_for('/static', 'icons', 'preferences-desktop-wallpaper.png') %]"
+    <img src="[% c.uri_for('/static', 'images', 'preferences-desktop-wallpaper.png') %]"
     alt="[% "Ordinateur " _ hostgroupname %]">
     </div>
@@ -13,3 +13,3 @@
     </div>
 </div>
-<div id="oinfo_close"></div>
+<div 
Index: trunk/LATMOS-Accounts-Web/root/html/netzones/object_header.tt
===================================================================
--- trunk/LATMOS-Accounts-Web/root/html/netzones/object_header.tt	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/root/html/netzones/object_header.tt	(revision 1162)
@@ -4,5 +4,5 @@
 <div id="oinfo">
     <div id="oinfo_icons">
-    <img src="[% c.uri_for('/static', 'icons', 'preferences-desktop-wallpaper.png') %]"
+    <img src="[% c.uri_for('/static', 'images', 'preferences-desktop-wallpaper.png') %]"
     alt="[% "Ordinateur " _ hostgroupname %]">
     </div>
@@ -13,3 +13,30 @@
     </div>
 </div>
-<div id="oinfo_close"></div>
+
+<div id="oaction">
+[% IF c.model('Accounts').db.check_acl(netzone, 'exported', 'w') %]
+    [% IF NOT netzone.get_c_field('exported') %]
+    <form method="POST" action="[% c.uri_for('/netzones', netzonename, subform) %]"
+          onSubmit="return confirm('Activer la zone [% netzonename %] ?') ? true : false">
+    <input type="image" name="delete" value="Supprimer" title="Supprimer"
+    alt="effacer" src="[% c.uri_for('/static', 'images', 'edit-enable.png') %]">
+    <input type="hidden" value="activer" name="make_active">
+    </form>
+    [% ELSE %]
+    <form method="POST" action="[% c.uri_for('/netzones', netzonename, subform) %]"
+          onSubmit="return confirm('DÃ©sactiver la zone [% netzonename %] ?') ? true : false">
+    <input type="image" name="delete" value="Supprimer" title="Supprimer"
+    alt="effacer" src="[% c.uri_for('/static', 'images', 'edit-disable.png') %]">
+    <input type="hidden" value="dÃ©sactiver" name="make_inactive">
+    </form>
+    [% END %]
+[% END %]
+[% IF c.model('Accounts').db.check_acl(netzone, 'DELETE', 'w') %]
+    <form method="POST" action="[% c.uri_for('/netzones', netzonename, subform) %]"
+          onSubmit="return confirm('DÃ©truire la zone [% netzonename %] ?') ? true : false">
+    <input type="image" name="delete" value="Supprimer" title="Supprimer"
+    alt="effacer" src="[% c.uri_for('/static', 'images', 'edit-delete.png') %]">
+    <input type="hidden" value="DETRUIRE" name="delete">
+    </form>
+[% END %]
+</div> 
Index: trunk/LATMOS-Accounts-Web/root/html/search/index.tt
===================================================================
--- trunk/LATMOS-Accounts-Web/root/html/search/index.tt	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/root/html/search/index.tt	(revision 1162)
@@ -20,5 +20,5 @@
     </td>
     <td><a href="[% c.uri_for('/' _ c.forward('/obj_to_uri', [ filter.otype ]), object.id) %]">
-        <img src="[% c.uri_for('/static', 'icons', 'icon_edit.png') %]"
+        <img src="[% c.uri_for('/static', 'images', 'icon_edit.png') %]"
             height="16" width="16"
             alt="[% "edit " _ object.id | html %]"></a>
Index: trunk/LATMOS-Accounts-Web/root/html/services/mailing/to.tt
===================================================================
--- trunk/LATMOS-Accounts-Web/root/html/services/mailing/to.tt	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/root/html/services/mailing/to.tt	(revision 1162)
@@ -22,5 +22,5 @@
 </span>
 <br>
-<input type="image" src="[% c.uri_for('/static/icons/find.png') %]" width="24" height="24">
+<input type="image" src="[% c.uri_for('/static', 'images', 'find.png') %]" width="24" height="24">
 [% c.prototype.observe_field( 'to_type', {
     update => 'to_res',
@@ -54,5 +54,5 @@
 <div style="width: 20em; float:left; border: solid;">
 [%  c.prototype.link_to_remote(
-    '<img src="' _ c.uri_for('/static/icons', 'editclear.png') _ '" title="Vider la liste">',
+    '<img src="' _ c.uri_for('/static', 'images', 'editclear.png') _ '" title="Vider la liste">',
     {
     update => 'destlist',
@@ -62,5 +62,5 @@
 <span style="float: right">
 <a href="[% c.uri_for('/services', 'mailing') %]">
-<img src="[% c.uri_for('/static/icons', 'emblem-default.png') %]"
+<img src="[% c.uri_for('/static', 'images', 'emblem-default.png') %]"
  title="Valider la liste">
 </a>
Index: trunk/LATMOS-Accounts-Web/root/html/sites/menu.tt
===================================================================
--- trunk/LATMOS-Accounts-Web/root/html/sites/menu.tt	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/root/html/sites/menu.tt	(revision 1162)
@@ -5,5 +5,5 @@
 <div id="oinfo">
     <div id="oinfo_icons">
-    <img src="[% c.uri_for('/static', 'icons', 'user-properties.png') %]"
+    <img src="[% c.uri_for('/static', 'images', 'user_conf.png') %]"
     alt="[% "User " _ sitename %]">
     </div>
@@ -13,3 +13,3 @@
     </div>
 </div>
-<div id="oinfo_close"></div>
+<div 
Index: trunk/LATMOS-Accounts-Web/root/html/sites/object_header.tt
===================================================================
--- trunk/LATMOS-Accounts-Web/root/html/sites/object_header.tt	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/root/html/sites/object_header.tt	(revision 1162)
@@ -5,11 +5,43 @@
 <div id="oinfo">
     <div id="oinfo_icons">
-    <img src="[% c.uri_for('/static', 'icons', 'user-properties.png') %]"
+    [% IF site.get_c_field('exported') %]
+    <img src="[% c.uri_for('/static', 'images', 'site_conf.png') %]"
     alt="[% "User " _ sitename %]">
+    [% ELSE %]
+    <img src="[% c.uri_for('/static', 'images', 'gtk-delete.png') %]"
+    alt="[% "User " _ sitename %]">
+    [% END %]
     </div>
     <div id="oinfo_label">
     <p id="oname">[% sitename | html %]</p>
-    <p>[% user.get_c_field('l') | html %]</p>
+    <p>[% site.get_c_field('description') || site.get_c_field('l') | html %]</p>
     </div>
 </div>
-<div id="oinfo_close"></div>
+
+<div id="oaction">
+[% IF c.model('Accounts').db.check_acl(site, 'exported', 'w') %]
+    [% IF NOT site.get_c_field('exported') %]
+    <form method="POST" action="[% c.uri_for('/sites', sitename, subform) %]"
+          onSubmit="return confirm('Activer le site [% sitename %] ?') ? true : false">
+    <input type="image" name="img" value="Supprimer" title="Supprimer"
+    alt="effacer" src="[% c.uri_for('/static', 'images', 'edit-enable.png') %]">
+    <input type="hidden" value="activer" name="make_active">
+    </form>
+    [% ELSE %]
+    <form method="POST" action="[% c.uri_for('/sites', sitename, subform) %]"
+          onSubmit="return confirm('DÃ©sactiver l\'utilisateur [% sitename %] ?') ? true : false">
+    <input type="image" name="delete" value="Supprimer" title="Supprimer"
+    alt="effacer" src="[% c.uri_for('/static', 'images', 'edit-disable.png') %]">
+    <input type="hidden" value="dÃ©sactiver" name="make_inactive">
+    </form>
+    [% END %]
+[% END %]
+[% IF c.model('Accounts').db.check_acl(site, 'DELETE', 'w') %]
+    <form method="POST" action="[% c.uri_for('/sites', sitename, subform) %]"
+          onSubmit="return confirm('DÃ©truire l\'utilisateur [% sitename %] ?') ? true : false">
+    <input type="image" name="delete" value="Supprimer" title="Supprimer"
+    alt="effacer" src="[% c.uri_for('/static', 'images', 'edit-delete.png') %]">
+    <input type="hidden" value="DETRUIRE" name="delete">
+    </form>
+[% END %]
+</div>
Index: trunk/LATMOS-Accounts-Web/root/html/users/address.tt
===================================================================
--- trunk/LATMOS-Accounts-Web/root/html/users/address.tt	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/root/html/users/address.tt	(revision 1162)
@@ -7,5 +7,4 @@
 
 <div id="objectform" class="objectform">
-<div style="padding:2em; border:outset">
 <table border="0">
     [% FOREACH idaddress = user.get_c_field('otheraddress') %]
@@ -44,5 +43,5 @@
         <input type="image" value="Effacer" title="Supprimer" alt="effacer"
             src="[% c.uri_for('/static', 'images', 'edit-delete.png') %]"
-            class="attr"
+            class="attrbutton"
         >
         </form>
@@ -57,6 +56,6 @@
         <input type="hidden" name="main" value="[% laddress.id | html %]">
         <input type="image" value="" title="Passer en principale" alt="effacer"
-            src="[% c.uri_for('/static', 'icons', 'emblem-favorite.png') %]"
-            class="attr"
+            src="[% c.uri_for('/static', 'images', 'emblem-favorite.png') %]"
+            class="attrbutton"
             style="display:inline;"
         >
@@ -80,5 +79,4 @@
     [% END %]
     </table>
-</div>
 
 
@@ -86,24 +84,4 @@
 <div id="oform">
 
-
-<p style="text-align:center">
-
-[% IF  address.get_c_field('unexported') %]
-<img src="[% c.uri_for('/static', 'images', 'mail-mark-junk.png') %]">
-[% ELSE %]
-<img src="[% c.uri_for('/static', 'images', 'mail-mark-unread.png') %]">
-[% END %]
-
-[% IF  address.get_c_field('isMainAddress') %]
-
-        <img src="[% c.uri_for('/static', 'icons', 'gtk-home.png') %]"
-            title="Adresse principale" alt="Adresse principale"
-        >
-[% END %]
-[% address.get_c_field('l') | html %]
-[% IF address.get_c_field('physicalDeliveryOfficeName') %]
-- [% address.get_c_field('physicalDeliveryOfficeName') | html %]
-[% END %]
-</p>
 
 <form action="[% c.uri_for(username, subform, address.id) %]" method="POST">
Index: trunk/LATMOS-Accounts-Web/root/html/users/address_form.tt
===================================================================
--- trunk/LATMOS-Accounts-Web/root/html/users/address_form.tt	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/root/html/users/address_form.tt	(revision 1162)
@@ -1,4 +1,23 @@
 <!-- $Id$ -->
 <table border="1">
+
+<tr><th colspan=2>
+[% IF  address.get_c_field('unexported') %]
+<img src="[% c.uri_for('/static', 'images', 'mail-mark-junk.png') %]">
+[% ELSE %]
+<img src="[% c.uri_for('/static', 'images', 'mail-mark-unread.png') %]">
+[% END %]
+
+[% IF  address.get_c_field('isMainAddress') %]
+
+        <img src="[% c.uri_for('/static', 'images', 'gtk-home.png') %]"
+            title="Adresse principale" alt="Adresse principale"
+        >
+[% END %]
+[% address.get_c_field('l') | html %]
+[% IF address.get_c_field('physicalDeliveryOfficeName') %]
+- [% address.get_c_field('physicalDeliveryOfficeName') | html %]
+[% END %]
+</th></tr>
 
 [% FOREACH attrs IN [ 'site', 'description', 'isMainAddress',
Index: trunk/LATMOS-Accounts-Web/root/html/users/groups.tt
===================================================================
--- trunk/LATMOS-Accounts-Web/root/html/users/groups.tt	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/root/html/users/groups.tt	(revision 1162)
@@ -9,5 +9,4 @@
 [% modallow = c.model('Accounts').db.check_acl(user, 'memberOf', 'w') %]
 
-<div id="oform">
 <table border="1">
 <tr>
@@ -22,10 +21,10 @@
 [% IF user.get_attributes('department') == g OR 
       user.get_attributes('contratType') == g %]
-<img src="[% c.uri_for('/static', 'icons', 'changes-prevent.png') %]"
+<img src="[% c.uri_for('/static', 'images', 'changes-prevent.png') %]"
     width="24" height="24" title="Ce groupe est gÃ©rÃ© via un autre attribut">
 [% ELSE %]
 <form action="[% c.uri_for(username, subform) %]" method="POST" style="display: inline">
 <input type="hidden" name="delgroup" value="[% g | html %]">
-<input type="image" src="[% c.uri_for('/static', 'icons', 'user-group-delete.png') %]" width="24" height="24">
+<input type="image" src="[% c.uri_for('/static', 'images', 'group_del.png') %]" width="24" height="24">
 </form>
 [% END %]
@@ -46,4 +45,5 @@
 <hr>
 </form>
+<br>
 [% c.prototype.observe_field('gfilter', {
     url => c.uri_for('/ajax', 'user_to_group_form', username),
@@ -67,4 +67,3 @@
 
 </div>
-</div>
 [% END %]
Index: trunk/LATMOS-Accounts-Web/root/html/users/mail.tt
===================================================================
--- trunk/LATMOS-Accounts-Web/root/html/users/mail.tt	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/root/html/users/mail.tt	(revision 1162)
@@ -4,8 +4,7 @@
 [% ELSE %]
 
-<div id="objectform" class="objectform">
 [% INCLUDE 'users/object_header.tt' %]
 
-<div id="oform">
+<div id="objectform" class="objectform">
 
 <form action="[% c.uri_for(user.id, 'mail') %]" method="POST">
@@ -114,4 +113,3 @@
 
 </div>
-</div>
 [% END %]
Index: trunk/LATMOS-Accounts-Web/root/html/users/object_header.tt
===================================================================
--- trunk/LATMOS-Accounts-Web/root/html/users/object_header.tt	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/root/html/users/object_header.tt	(revision 1162)
@@ -5,30 +5,13 @@
     <div id="oinfo_icons">
     [% IF NOT user.get_c_field('exported') %]
-    <img src="[% c.uri_for('/static', 'icons', 'gtk-delete.png') %]"
+    <img src="[% c.uri_for('/static', 'images', 'gtk-delete.png') %]"
     alt="[% "User " _ username %]" title="le compte est dÃ©sactivÃ©">
-    [% IF c.model('Accounts').db.check_acl(user, 'exported', 'w') %]
-<script LANGUAGE="JavaScript">
-<!--
-function confirmSubmit()
-{
-var agree=confirm("Activer l'utilisateur [% username %] ?");
-if (agree)
-    return true ;
-else
-    return false ;
-}
-// -->
-</script>
-    <form method="POST" action="[% c.uri_for('/users', username, subform) %]" onsubmit="return confirmSubmit()">
-    <input type="submit" value="activer" name="make_active">
-    </form>
-    [% END %]
     [% ELSE %]
-    <img src="[% c.uri_for('/static', 'icons', 'user-properties.png') %]"
+    <img src="[% c.uri_for('/static', 'images', 'user_conf.png') %]"
     alt="[% "User " _ username %]">
     [% END %]
 
     [% IF user.get_c_field('locked') %]
-    <img src="[% c.uri_for('/static', 'icons', 'locked.png') %]" 
+    <img src="[% c.uri_for('/static', 'images', 'locked.png') %]" 
     alt="le compte est vÃ©rrouillÃ©" title="le compte est vÃ©rrouillÃ©">
     [% END %]
@@ -41,5 +24,32 @@
     </div>
 </div>
-<div id="oinfo_close"></div>
+
+<div id="oaction">
+[% IF c.model('Accounts').db.check_acl(user, 'exported', 'w') %]
+    [% IF NOT user.get_c_field('exported') %]
+    <form method="POST" action="[% c.uri_for('/users', username, subform) %]"
+          onSubmit="return confirm('Activer l\'utilisateur [% username %] ?') ? true : false">
+    <input type="image" name="delete" value="Supprimer" title="Supprimer"
+    alt="effacer" src="[% c.uri_for('/static', 'images', 'edit-enable.png') %]">
+    <input type="hidden" value="activer" name="make_active">
+    </form>
+    [% ELSE %]
+    <form method="POST" action="[% c.uri_for('/users', username, subform) %]"
+          onSubmit="return confirm('DÃ©sactiver l\'utilisateur [% username %] ?') ? true : false">
+    <input type="image" name="delete" value="Supprimer" title="Supprimer"
+    alt="effacer" src="[% c.uri_for('/static', 'images', 'edit-disable.png') %]">
+    <input type="hidden" value="dÃ©sactiver" name="make_inactive">
+    </form>
+    [% END %]
+[% END %]
+[% IF c.model('Accounts').db.check_acl(user, 'DELETE', 'w') %]
+    <form method="POST" action="[% c.uri_for('/users', username, subform) %]"
+          onSubmit="return confirm('DÃ©truire l\'utilisateur [% username %] ?') ? true : false">
+    <input type="image" name="delete" value="Supprimer" title="Supprimer"
+    alt="effacer" src="[% c.uri_for('/static', 'images', 'edit-delete.png') %]">
+    <input type="hidden" value="DETRUIRE" name="delete">
+    </form>
+[% END %]
+</div>
 
 <div id="omenu">
@@ -59,5 +69,4 @@
         <a href="[% c.uri_for(username, 'passwd') %]"><span [% 'id="oactive"' IF subform == 'passwd' %]>Mot de passe</span></a>
 [% END %]
-        <div id="omenuclose"></div>
 </div>
 
Index: trunk/LATMOS-Accounts-Web/root/static/struct.css
===================================================================
--- trunk/LATMOS-Accounts-Web/root/static/struct.css	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/root/static/struct.css	(revision 1162)
@@ -9,4 +9,5 @@
     width: 20%;
     padding: 0.2em;
+    float: left;
 }
 
@@ -14,4 +15,36 @@
     width: 78%;
     padding: 0.2em;
+    float: left;
+}
+
+#oinfo {
+}
+
+#oaction {
+    clear: both;
+}
+#oaction form {
+    display: inline-block;
+}
+
+#omenu {
+    clear: both;
+}
+
+#objectform {
+    clear: both;
+}
+
+#objectform div {
+    display: inline-block;
+    vertical-align: text-top;
+}
+#objectform form {
+    display: inline-block;
+    vertical-align: text-top;
+}
+#objectform table {
+    display: inline-block;
+    vertical-align: text-top;
 }
 
@@ -21,18 +54,5 @@
 }
 
-#login_name {
-    font-size: 0.8em;
-
+#navigate {
+    float: right;
 }
-
-#objectform {
-}
-
-.objectformleft #oform {
-        float: left;
-}
-
-#oform {
-    margin-left:auto;
-    margin-right:auto;
-}
Index: trunk/LATMOS-Accounts-Web/root/static/style.css
===================================================================
--- trunk/LATMOS-Accounts-Web/root/static/style.css	(revision 1160)
+++ trunk/LATMOS-Accounts-Web/root/static/style.css	(revision 1162)
@@ -1,2 +1,4 @@
+/* global dcl: */
+
 img {
     border: none;
@@ -5,4 +7,87 @@
 }
 
+input[type=image] {
+    border: outset;
+    border-color: black;
+    vertical-align: middle;
+    background-color: #DDDDD9;
+}
+img.editobject {
+    width: 1.5em;
+    height:1.5em;
+    vertical-align: middle;
+}
+img.notice {
+    width: 1em;
+    height:1em;
+    vertical-align: middle;
+}
+img.attr {
+    width: 1.5em;
+    height:1.5em;
+    vertical-align: middle;
+}
+input.attr {
+    width: 1.5em;
+    height:1.5em;
+    vertical-align: middle;
+}
+/* Button like */
+img.button {
+    border: outset;
+    border-color: black;
+}
+input.button {
+    border: outset;
+    border-color: black;
+}
+img.attrbutton {
+    border: outset;
+    border-color: black;
+    width: 1.5em;
+    height:1.5em;
+    vertical-align: middle;
+}
+input.attrbutton {
+    border: outset;
+    border-color: black;
+    width: 1.5em;
+    height:1.5em;
+    vertical-align: middle;
+}
+
+.unexported {
+    text-decoration: line-through;
+    color: grey;
+}
+
+
+#header {
+    padding: 1px;
+}
+#header h1 {
+    text-align: center;
+    font-size: 1.2em;
+    margin: 0px;
+    padding: 0em;
+    background-color: #7DB4D8;
+}
+
+#sidebar {
+    border: solid;
+    border-color: #437ba1;
+}
+#sidebar ul {
+    list-style-type: none;
+    padding-top: 0.2em;
+    padding-left: 0em;
+}
+#sidebar li {
+    font-size: 0.8em;
+}
+#sidebar a:hover {
+    background-color: #7DB4D8;
+}
+
 #oinfo p {
     padding: 0em;
@@ -10,22 +95,27 @@
     margin-left: 1em;
 }
-
 #oinfo p#oname {
     text-transform: capitalize;
     font-size: 1.2em;
 }
-
 #oinfo_icons {
     float: left;
 }
-
+#oname img {
+    width: 1.5em;
+    height:1.5em;
+    vertical-align: middle;
+}
 #oinfo_label {
     float: left;
 }
-
-#oinfo_close {
-    clear: both
-}
-
+#navigate {
+    margin: 0em;
+    padding: 0em;
+}
+#navigate p {
+    margin: 0em;
+    text-align: center;
+}
 
 /* Object menu: */
@@ -35,5 +125,4 @@
     color: black;
 }
-
 #omenu div {
     padding-top: 0.5em;
@@ -42,5 +131,4 @@
     margin: 0em;
 }
-
 #omenu span {
     padding-left: 0.5em;
@@ -53,5 +141,4 @@
     color: black;
 }
-
 #omenu span#oactive {
     padding-left: 0.5em;
@@ -64,49 +151,22 @@
     color: black;
 }
-
 #omenu a:hover {
     text-color blue;
 }
 
-#omenuclose {
-    clear: both;
-}
-
-#navigate {
-}
-
-#navigate p {
-    margin: 0em;
-    text-align: center;
-}
-
-#navigate input {
-    width: 3em;
-    height:3em;
-    vertical-align: middle;
-}
-
-#navigate img {
-    width: 2em;
-    height:2em;
-    vertical-align: middle;
-}
-
-img.notice {
-    width: 1em;
-    height:1em;
-    vertical-align: middle;
-}
-
-img.attr {
-    width: 1.5em;
-    height:1.5em;
-    vertical-align: middle;
-}
-input.attr {
-    width: 1.5em;
-    height:1.5em;
-    vertical-align: middle;
-}
+
+#user_group_form {
+    max-height: 15em;
+    width: 15em;
+    overflow: auto;
+    border: inset;
+}
+#user_group_form ul {
+    list-style-type: none;
+    padding: 0.2em;
+    font-size: 0.9em;
+}
+
+    /*
 
 span.hint {
@@ -123,34 +183,4 @@
 }
 
-#mainmenu a {
-    font-size: 50px;
-    overflow: hidden;
-    text-decoration: none;
-}
-
-#mainmenu span {
-    padding-left: 1em;
-    padding-right: 1em;
-    text-decoration: none;
-}
-
-.pmenu span {
-    padding-left: 1em;
-    padding-right: 1em;
-    text-decoration: none;
-}
-
-#mainmenu span#actif {
-    border-style: outset;
-    padding-left: 1em;
-    padding-right: 1em;
-    text-decoration: none;
-    height: 32px;
-}
-
-#mainmenu a:hover {
-    background-color: #7DB4D8;
-}
-
 #oinfo div {
     float: left;
@@ -162,24 +192,10 @@
     margin: 0em;
 }
+*/
+/*
 
 div.objectform  {
 }
 
-.oform {
-    margin: 0.5em;
-}
-
-.oform table {
-    margin: 0.5em;
-}
-
-.oform td {
-    vertical-align: top;
-}
-
-.oform p {
-    margin: 0.5em;
-    font-weight: bold;
-}
 
 .oform ul {
@@ -192,4 +208,6 @@
 }
 
+*/
+/*
 .inputvalidate img {
     width: 1em;
@@ -213,39 +231,5 @@
 }
 
-.unexported {
-    text-decoration: line-through;
-    color: grey;
-}
-
-#sidebar {
-/*    background-color: #4e8fbb; */
-    border: solid;
-    border-color: #437ba1;
-}
-
-#sidebar ul {
-    list-style-type: none;
-    padding-top: 0.2em;
-    padding-left: 0em;
-}
-
-#sidebar li {
-    font-size: 0.8em;
-}
-
-#sidebar a:hover {
-    background-color: #7DB4D8;
-}
-
-#header {
-    padding: 1px;
-}
-
-
-#header h1 {
-    text-align: center;
-    font-size: 1.2em;
-    margin: 0px;
-    padding: 0em;
-    background-color: #7DB4D8;
-}
+
+
+    */
