Changeset 1257 for branches


Ignore:
Timestamp:
09/29/14 17:10:00 (10 years ago)
Author:
nanardon
Message:

merge fixes from trunk

Location:
branches/4.0/LATMOS-Accounts-Web
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/4.0/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm

    r1237 r1257  
    100100        name => 'SystÚme', 
    101101        attrs => [ qw( 
    102             gidNumber description 
     102            gidNumber 
     103            description label 
    103104            managedBy 
    104105            managedAlsoBy 
  • branches/4.0/LATMOS-Accounts-Web/root/html/groups/object_header.tt

    r1162 r1257  
    2424    <form method="POST" action="[% c.uri_for('/groups', groupname, subform) %]" 
    2525          onSubmit="return confirm('Activer le groupe [% groupname %] ?') ? true : false"> 
    26     <input type="image" name="delete" value="Supprimer" title="Supprimer" 
     26    <input type="image" name="make_active" value="Activer" title="Activer" 
    2727    alt="effacer" src="[% c.uri_for('/static', 'images', 'edit-enable.png') %]"> 
    2828    <input type="hidden" value="activer" name="make_active"> 
     
    3131    <form method="POST" action="[% c.uri_for('/groups', groupname, subform) %]" 
    3232          onSubmit="return confirm('Désactiver le group [% groupname %] ?') ? true : false"> 
    33     <input type="image" name="delete" value="Supprimer" title="Supprimer" 
     33    <input type="image" name="make_inactive" value="Désactiver" title="Désactiver" 
    3434    alt="effacer" src="[% c.uri_for('/static', 'images', 'edit-disable.png') %]"> 
    3535    <input type="hidden" value="désactiver" name="make_inactive"> 
  • branches/4.0/LATMOS-Accounts-Web/root/html/nethosts/object_header.tt

    r1228 r1257  
    2525    <form method="POST" action="[% c.uri_for('/nethosts', nethostname, subform) %]" 
    2626          onSubmit="return confirm('Activer l\'hÃŽte [% nethostname %] ?') ? true : false"> 
    27     <input type="image" name="delete" value="Supprimer" title="Supprimer" 
     27    <input type="image" name="make_active" value="Activer" title="Activer" 
    2828    alt="effacer" src="[% c.uri_for('/static', 'images', 'edit-enable.png') %]"> 
    2929    <input type="hidden" value="activer" name="make_active"> 
     
    3232    <form method="POST" action="[% c.uri_for('/nethosts', nethostname, subform) %]" 
    3333          onSubmit="return confirm('Désactiver l\'hÃŽte [% nethostname %] ?') ? true : false"> 
    34     <input type="image" name="disable" value="Désactiver" title="Désactiver" 
     34    <input type="image" name="make_inactive" value="Désactiver" title="Désactiver" 
    3535    alt="effacer" src="[% c.uri_for('/static', 'images', 'edit-disable.png') %]"> 
    3636    <input type="hidden" value="désactiver" name="make_inactive"> 
  • branches/4.0/LATMOS-Accounts-Web/root/html/netzones/object_header.tt

    r1162 r1257  
    1919    <form method="POST" action="[% c.uri_for('/netzones', netzonename, subform) %]" 
    2020          onSubmit="return confirm('Activer la zone [% netzonename %] ?') ? true : false"> 
    21     <input type="image" name="delete" value="Supprimer" title="Supprimer" 
     21    <input type="image" name="make_active" value="Activer" title="Activer" 
    2222    alt="effacer" src="[% c.uri_for('/static', 'images', 'edit-enable.png') %]"> 
    2323    <input type="hidden" value="activer" name="make_active"> 
     
    2626    <form method="POST" action="[% c.uri_for('/netzones', netzonename, subform) %]" 
    2727          onSubmit="return confirm('Désactiver la zone [% netzonename %] ?') ? true : false"> 
    28     <input type="image" name="delete" value="Supprimer" title="Supprimer" 
     28    <input type="image" name="make_inactive" value="Désactiver" title="Désactiver" 
    2929    alt="effacer" src="[% c.uri_for('/static', 'images', 'edit-disable.png') %]"> 
    3030    <input type="hidden" value="désactiver" name="make_inactive"> 
  • branches/4.0/LATMOS-Accounts-Web/root/html/users/object_header.tt

    r1233 r1257  
    3131    <form method="POST" action="[% c.uri_for('/users', username, subform) %]" 
    3232          onSubmit="return confirm('Activer l\'utilisateur [% username %] ?') ? true : false"> 
    33     <input type="image" name="delete" value="Supprimer" title="Supprimer" 
     33    <input type="image" name="make_active" value="Activer" title="Activer" 
    3434    alt="effacer" src="[% c.uri_for('/static', 'images', 'edit-enable.png') %]"> 
    3535    <input type="hidden" value="activer" name="make_active"> 
     
    3838    <form method="POST" action="[% c.uri_for('/users', username, subform) %]" 
    3939          onSubmit="return confirm('Désactiver l\'utilisateur [% username %] ?') ? true : false"> 
    40     <input type="image" name="delete" value="Désactiver" title="Désactiver" 
     40    <input type="image" name="make_inactive" value="Désactiver" title="Désactiver" 
    4141    alt="désactiver" src="[% c.uri_for('/static', 'images', 'edit-disable.png') %]"> 
    4242    <input type="hidden" value="désactiver" name="make_inactive"> 
Note: See TracChangeset for help on using the changeset viewer.